diff --git a/content.js b/content.js index 42c0cf08..a84f2911 100644 --- a/content.js +++ b/content.js @@ -31,11 +31,12 @@ $(document).ready( function() { chrome.runtime.sendMessage({command: "alreadyContains",unique: $(this).find('td[data-th="Unique"]').text()}, function(response) { if(response.alreadyContains){ //DO SOMETHING IF ALREADY CONTAINS + console.log("ALREADY CONTAINS IN THIS ROW"); } }); } }); - + $(".distButton").click(function(){ var row = $(this).closest('tr'); getCourseInfo(row); diff --git a/popup.css b/popup.css new file mode 100644 index 00000000..22d102bc --- /dev/null +++ b/popup.css @@ -0,0 +1,76 @@ + .card { + box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); + transition: 0.3s; + margin:5px; + } + + .card:hover { + box-shadow: 0 8px 12px 0 rgba(0,0,0,0.2); + } + + .container { + padding: 2px 16px; + } + h2 { + padding: 10px 0px 0 10px; + } + li { + width: 350px; + + } + body{ + min-width: 350px; + min-height: 400px; + } + .matbut { + border: none; + outline: none; + cursor: pointer; + color: white; + margin: 10px 10px 10px 0px; + padding: 10px 10px; + border-radius: 10px; + font-size: medium; + font-style: bold; + box-shadow: 2px 2px 4px rgba(0, 0, 0, .4); + background: #FF9800; + } + + /* Ripple magic */ + .matbut{ + position: relative; + overflow: hidden; + } + + .matbut:after { + content: ''; + position: absolute; + top: 50%; + left: 50%; + width: 5px; + height: 5px; + background: rgba(255, 255, 255, .5); + opacity: 0; + border-radius: 100%; + transform: scale(1, 1) translate(-50%); + transform-origin: 50% 50%; + } + + @keyframes ripple { + 0% { + transform: scale(0, 0); + opacity: 1; + } + 20% { + transform: scale(25, 25); + opacity: 1; + } + 100% { + opacity: 0; + transform: scale(40, 40); + } + } + + .matbut:focus:not(:active)::after { + animation: ripple 1s ease-out; + } \ No newline at end of file diff --git a/popup.html b/popup.html index 9e1fdb90..90945616 100644 --- a/popup.html +++ b/popup.html @@ -1,37 +1,19 @@ - - + + - - -

Saved Courses

- + + + + diff --git a/popup.js b/popup.js index 403ea977..ed4b07f8 100644 --- a/popup.js +++ b/popup.js @@ -6,10 +6,10 @@ chrome.storage.sync.get('savedCourses', function(data) { for(var i = 0; i"+text+""); + $("#courseList").prepend("

"+text+""); } }); var courses = data.savedCourses; @@ -26,17 +26,20 @@ chrome.storage.sync.get('savedCourses', function(data) { else if(status.includes("closed") || status.includes("cancelled")){ color = "#F44336"; } - var listhtml = "

  • "+courses[i].unique+"

    "+courses[i].coursename+"

    • "; + var department = courses[i].coursename.substring(0,courses[i].coursename.search(/\d/)-2); + var course_nbr = courses[i].coursename.substring(courses[i].coursename.search(/\d/),courses[i].coursename.indexOf(" ",courses[i].coursename.search(/\d/))); + var profname = courses[i].profname.substring(0,1)+courses[i].profname.substring(1).toLowerCase(); + var listhtml = "

  • "+department + " "+course_nbr+""+" with "+profname+"

    • "; $("#courseList").append(listhtml); - } }); -$(document).keydown(function(e) { - if (e.keyCode == 67) { - clear(); - } +$(document).ready(function() { + $("#clear").click(function(){ + clear(); }); +}); + function clear(){ chrome.storage.sync.set({savedCourses: []}); console.log("cleared"); diff --git a/todo b/todo index 5ffbc8c0..7094cd65 100644 --- a/todo +++ b/todo @@ -1,18 +1,21 @@ -TODO: -- undefined prof, show all possible profs from past? - DIFFERENT IF NO PROF +TODO as of 7/10/18: +- undefined prof, show all possible profs from past? (DIFFERENT IF NO PROF) - Online classes/no location -- Schedule Conflicts - save image of modal? +- no place - Degree plan? +- default message save courses +- eureka integration - underline Courses maybe? click to go to using the planner link thing -- when almost everything is blank: M 379H as example - schedule generator -- FIX POP UP CARD NOT FILLING FULL LENGTH +- show schedule conflicts on the course page +-added/removing/action toasts + CLEAN UP: Everything lmao KNOWN BUGS: +- FIX POP UP CARD NOT FILLING FULL LENGTH IN-PROGRESS: @@ -20,7 +23,7 @@ IN-PROGRESS: -FIXED/DONE since 7/7/18: +FIXED/DONE as of 7/10/18: - Scrolling Modal :| - Description - no Data (prof hasn't taught that class before) @@ -36,3 +39,5 @@ FIXED/DONE since 7/7/18: - Saving courses - waitlist/closed/open colors - popup.html +- Schedule Conflicts +- when almost everything is blank: M 379H as example