aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHumairAK <humair88@hotmail.com>2016-07-27 01:59:20 +0000
committerHumairAK <humair88@hotmail.com>2016-07-27 01:59:20 +0000
commit7e79ecbb517877f0bcc67a4553a766f65fd73d52 (patch)
tree41fe04e2dd47ed4c8eb200b7fd68398873ddeff0
parent7180bb0605e490b789d946aa64f8f678cbf13f00 (diff)
split up script files, only serving relevant scripts for each page accordingly
-rw-r--r--assets/js/script.js127
-rw-r--r--routes/admin.js2
-rw-r--r--routes/index.js2
-rw-r--r--routes/user.js2
-rw-r--r--views/layouts/layout.hbs10
5 files changed, 13 insertions, 130 deletions
diff --git a/assets/js/script.js b/assets/js/script.js
index ae49e32..44d7422 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -1,110 +1,4 @@
function main(){
-
- // User-profile dynamic paging
- var items = [
- $("#profile-general"),
- $("#profile-follows"),
- $("#profile-friends"),
- $("#profile-inbox"),
- $("#profile-comments"),
- $('#profile-send-message')];
-
- function hidePages(){
- items.forEach(function(item){
- item.hide();
- });
- }
-
- // Hide all pages at load
- hidePages();
-
- // Show General page
- items[0].show();
-
- $('.prf-page').bind('click', function(e){
-
- e.preventDefault();
- hidePages();
-
- /* Each case will need to be changed to call a handler for fetching data
- * from server*/
- switch($(this).text()) {
- case "General":
- console.log("clicked general");
- $("#profile-general").show();
- break;
- case "Following":
- $("#profile-follows").show();
- break;
- case "Friends":
- $("#profile-friends").show();
- break;
- case "Inbox":
- $("#profile-inbox").show();
- break;
- case "Comments":
- $("#profile-comments").show();
- break;
- case "Send Message":
- $('#profile-send-message').show();
- break;
- default:
- console.log("Error: User page not found");
- }
- });
-
- // ********* Admin Panel Scripts *********** //
- var adminOptions = [
- $("#cpnl-addExam"),
- $("#cpnl-addCourse"),
- $("#cpnl-addAdmin"),
- $("#cpnl-removeExam"),
- $("#cpnl-removeCourse"),
- $("#cpnl-removeUser")
- ];
-
- function hideCpnlPages(){
- adminOptions.forEach(function(item){
- item.hide();
- });
- }
-
- hideCpnlPages();
-
- // Show General page
- adminOptions[0].show();
- $('.cpnl-page').bind('click', function(e){
-
- e.preventDefault();
- hideCpnlPages();
-
- /* Each case will need to be changed to call a handler for fetching data
- * from server*/
- switch($(this).text()) {
- case "Add Exam":
- $("#cpnl-addExam").show();
- break;
- case "Add Course":
- $("#cpnl-addCourse").show();
- break;
- case "Add Admin":
- $("#cpnl-addAdmin").show();
- break;
- case "Remove Exam":
- $("#cpnl-removeExam").show();
- break;
- case "Remove Course":
- $("#cpnl-removeCourse").show();
- break;
- case "Remove User":
- $("#cpnl-removeUser").show();
- break;
- default:
- console.log("Error: User page not found");
- }
- });
-
-
// --- nav scripts ---
$("input").keyup( function(event) {
if(event.keyCode == 13){
@@ -129,27 +23,6 @@ function main(){
$(this).parent('li').removeClass('active');
});
- $('.search-menu').bind('click', function(e) {
- e.preventDefault();
- $("#search-drop-down").click();
- var type = $(this).text();
-
- switch(type) {
- case "Courses":
- $("#search-field").attr("action","/search/courses");
- $("#user-input").attr("placeholder", "Enter coure code");
- $("#drop-down-value").text("Courses");
- break;
- case "Users":
- $("#search-field").attr("action","/search/users");
- $("#user-input").attr("placeholder", "Enter user info");
- $("#drop-down-value").text("Users");
- break;
- default:
- console.log("Error: Click not registered");
- }
- });
-
$('.table-row').trigger('create');
}
$(document).ready(main); \ No newline at end of file
diff --git a/routes/admin.js b/routes/admin.js
index 565d2dd..aac7c70 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -35,7 +35,7 @@ app.use(express_validator({
router.get('/', isAdmin, function(req,res){
console.log(req.session.messages);
- res.render('admin', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
+ res.render('admin', {adminPanel: true, csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
req.session.errors = null;
req.session.messages = null;
});
diff --git a/routes/index.js b/routes/index.js
index d631d7b..9b8dad9 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -11,7 +11,7 @@ var bcrypt = require('bcrypt-nodejs');
/* Render/GET homepage. */
router.get('/', function(req, res, next) {
//addFirstAdmin();
- res.render('index', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
+ res.render('index', {homePage: true, csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
req.session.errors = null;
req.session.success = null;
req.session.messages = null;
diff --git a/routes/user.js b/routes/user.js
index 74c5427..fc2827d 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -111,7 +111,7 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) {
getComments().then(getMail).then(function (data) {
console.log('got here fere');
- res.render('user_profile_alt', {inbox: inbox, error: error, csrfToken: req.csrfToken()});
+ res.render('user_profile_alt', {inbox: inbox, error: error, csrfToken: req.csrfToken(), userProfile: true});
});
//res.render('user_profile_alt', {comments : comments, inbox: inbox, csrfToken: req.csrfToken()});
diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
index b9895a5..17e9b3d 100644
--- a/views/layouts/layout.hbs
+++ b/views/layouts/layout.hbs
@@ -25,7 +25,17 @@
<!--JS-->
<script src="/assets/js/jquery-2.2.4.min.js"></script>
<script src="/assets/js/bootstrap.min.js"></script>
+
<script src="/assets/js/script.js"></script>
+ {{# if userProfile}}
+ <script src="/assets/js/user_profile.js"></script>
+ {{/if}}
+ {{# if adminPanel}}
+ <script src="/assets/js/admin_panel.js"></script>
+ {{/if}}
+ {{# if homePage }}
+ <script src="/assets/js/home_page.js"></script>
+ {{/if}}
</head>
<body>