From 7e79ecbb517877f0bcc67a4553a766f65fd73d52 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Tue, 26 Jul 2016 21:59:20 -0400 Subject: split up script files, only serving relevant scripts for each page accordingly --- assets/js/script.js | 127 ---------------------------------------------------- 1 file changed, 127 deletions(-) (limited to 'assets') 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 -- cgit v1.2.3 From cf290e2308006e468121603f65cea2e08dedd3ff Mon Sep 17 00:00:00 2001 From: HumairAK Date: Tue, 26 Jul 2016 21:59:44 -0400 Subject: added relevant scripts --- assets/js/admin_panel.js | 53 ++++++++++++++++++++++++++++++++++++++++++++++ assets/js/home_page.js | 26 +++++++++++++++++++++++ assets/js/user_profile.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 assets/js/admin_panel.js create mode 100644 assets/js/home_page.js create mode 100644 assets/js/user_profile.js (limited to 'assets') diff --git a/assets/js/admin_panel.js b/assets/js/admin_panel.js new file mode 100644 index 0000000..2d8757f --- /dev/null +++ b/assets/js/admin_panel.js @@ -0,0 +1,53 @@ +function main(){ + // ********* 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"); + } + }); +} +$(document).ready(main); \ No newline at end of file diff --git a/assets/js/home_page.js b/assets/js/home_page.js new file mode 100644 index 0000000..449461d --- /dev/null +++ b/assets/js/home_page.js @@ -0,0 +1,26 @@ +function main(){ + + // Search bar drop down scripting (some of it is shared with nav panel + // in script.js but this code in this file is exclusive to search bar + $('.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"); + } + }); +} +$(document).ready(main); \ No newline at end of file diff --git a/assets/js/user_profile.js b/assets/js/user_profile.js new file mode 100644 index 0000000..fa7add4 --- /dev/null +++ b/assets/js/user_profile.js @@ -0,0 +1,54 @@ +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"); + } + });} +$(document).ready(main); \ No newline at end of file -- cgit v1.2.3 From 96935191ed1741aa2185a88deb32a5de4b824219 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 27 Jul 2016 00:35:09 -0400 Subject: made a few adjustments, removed all avatar occurrences, a few other images for optimization and performance speed, replace pngs with svgs etc. --- assets/css/creative.css | 5 +++-- assets/css/style.css | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'assets') diff --git a/assets/css/creative.css b/assets/css/creative.css index 45f388b..17ee257 100644 --- a/assets/css/creative.css +++ b/assets/css/creative.css @@ -175,7 +175,6 @@ header { /*-moz-background-size: cover;*/ /*background-size: cover;*/ /*-o-background-size: cover;*/ - } header .header-spec { @@ -384,4 +383,6 @@ header .header-content .header-content-inner hr { } /********************************************/ - +.follow-exam-btn{ + margin: 15px; +} diff --git a/assets/css/style.css b/assets/css/style.css index eb683b1..19601e2 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -49,7 +49,6 @@ main .search h2{ .search input { text-align: center; box-sizing: border-box; - background: white url('../images/search_icon.png') no-repeat 9px 9px; background-size: 20px 20px; padding: 0; } @@ -155,6 +154,9 @@ main [id^="sol-"] img.user-image { main [id^="sol-"] p.username { vertical-align: middle; + padding-left: 10px; + font-weight: bolder; + } main [id^="sol-"] button.upvote, [id^="sol-"] button.downvote { @@ -337,6 +339,7 @@ p.solutions-time { .exam-info { margin-left: 5%; display: inline-block; + text-align: center; } img.exam-info { @@ -349,6 +352,7 @@ section.exam-info em { font-weight: bold; } + .questions-number{ font-size: large; color: #333333; @@ -366,6 +370,10 @@ section.exam-info em { .questions-sol-num { margin-left: 5%; } + +.questions-arrow{ + padding-top: 6px; +} /*** EXAM QUESTIONS PAGE END ***/ /*** USER PROFILE PAGE ***/ -- cgit v1.2.3 From 6c3bc1d9fe726227b4b02ee2c1c11eaa0034a3b9 Mon Sep 17 00:00:00 2001 From: HumairAK Date: Wed, 27 Jul 2016 00:35:38 -0400 Subject: added new svg to replace old png --- assets/images/right-arrow.svg | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 assets/images/right-arrow.svg (limited to 'assets') diff --git a/assets/images/right-arrow.svg b/assets/images/right-arrow.svg new file mode 100644 index 0000000..6a2166b --- /dev/null +++ b/assets/images/right-arrow.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3