Skip to content

Commit

Permalink
Update ColorService.js (#421)
Browse files Browse the repository at this point in the history
* Update ColorService.js

* Update ColorService.js

* fixed the CI problem (#427)

* Signed-off-by: dependabot[bot] <support@github.com> (#428)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updated CSVs (#426)

* updated

* updated semesters and maybe a fix to the test

* just testing

* updated

* updated csvs

* updated

* Moving to vuex (#425)

* Move selectedSemester, courses, semesters, departments, subsemesters into vuex

* Add isLoadingCourses vuex state

* Add check for courseObj in course page

* Default empty schedule for schedule controller

* Add route guard to student routes to load semester

* Load student courses on courses change

* Only add meta for coursepage if courseObj exists

* fixed the CI problem (#427)

* Signed-off-by: dependabot[bot] <support@github.com> (#428)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Move selectedSemester, courses, semesters, departments, subsemesters into vuex

* Add isLoadingCourses vuex state

* Add check for courseObj in course page

* Default empty schedule for schedule controller

* Add route guard to student routes to load semester

* Load student courses on courses change

* Only add meta for coursepage if courseObj exists

Co-authored-by: Richard Tsai <RichtXO@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* beep boop Github Action Master Branch CI Prettier hard at work

* Dark mode visibility (#423)

* Update CourseListing.vue

Update importance of color scheme

* Update dark.scss

Update button colors

* Update dark.scss

corrected line that was used for debugging

* Update dark.scss

Added component for hovering over course boxes

* Update SubjectExplorer.vue

Fixed hovering color switch (prev when you hovered over course box color did not switch)

* Update SubjectExplorer.vue

Slight color modification (to match other hover colors)

* Update dark.scss

comment cleanup

* Updating summer 2021 CSV (#416)

* Updating summer 2021 CSV

Just updating it periodically

* adding fall 2021

* updated courses

* updating summer :)

* Update CourseListing.vue

bug fix for clicking prerequisites course (prev forced back to light mode)

* fixed the CI problem (#427)

* Signed-off-by: dependabot[bot] <support@github.com> (#428)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updated CSVs (#426)

* updated

* updated semesters and maybe a fix to the test

* just testing

* updated

* updated csvs

* updated

* Update CourseListing.vue

Update importance of color scheme

* Update dark.scss

Update button colors

* Update dark.scss

corrected line that was used for debugging

* Update dark.scss

Added component for hovering over course boxes

* Update SubjectExplorer.vue

Fixed hovering color switch (prev when you hovered over course box color did not switch)

* Update SubjectExplorer.vue

Slight color modification (to match other hover colors)

* Update dark.scss

comment cleanup

* Update CourseListing.vue

bug fix for clicking prerequisites course (prev forced back to light mode)

Co-authored-by: Richard Tsai <RichtXO@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Move Sign Up Button (#411)

* First go at issue 373. Moved the Sign Up button into the Log In pop up window

* Updated summer2021 to account for partial semesters and update summer2021.csv (#413)

* Linked Course Names (#407)

* Proposed solution to Issue 387. The course names are now links to course pages.

* Created function for finding explore link

* Template strings because pretty

* beep boop Github Action Master Branch CI Prettier hard at work

* Added removed subsmester filter funcionality from #51 (#417)

* beep boop Github Action Master Branch CI Prettier hard at work

* Updating summer 2021 CSV (#416)

* Updating summer 2021 CSV

Just updating it periodically

* adding fall 2021

* updated courses

* updating summer :)

* Fixed the spacing between the buttons. Should be good now :)

* fixed the CI problem (#427)

* Signed-off-by: dependabot[bot] <support@github.com> (#428)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Updated CSVs (#426)

* updated

* updated semesters and maybe a fix to the test

* just testing

* updated

* updated csvs

* updated

* Moving to vuex (#425)

* Move selectedSemester, courses, semesters, departments, subsemesters into vuex

* Add isLoadingCourses vuex state

* Add check for courseObj in course page

* Default empty schedule for schedule controller

* Add route guard to student routes to load semester

* Load student courses on courses change

* Only add meta for coursepage if courseObj exists

* fixed the CI problem (#427)

* Signed-off-by: dependabot[bot] <support@github.com> (#428)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Move selectedSemester, courses, semesters, departments, subsemesters into vuex

* Add isLoadingCourses vuex state

* Add check for courseObj in course page

* Default empty schedule for schedule controller

* Add route guard to student routes to load semester

* Load student courses on courses change

* Only add meta for coursepage if courseObj exists

Co-authored-by: Richard Tsai <RichtXO@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* beep boop Github Action Master Branch CI Prettier hard at work

* First go at issue 373. Moved the Sign Up button into the Log In pop up window

* Fixed the spacing between the buttons. Should be good now :)

Co-authored-by: Daniel Ackermans <35609442+marchdan@users.noreply.github.com>
Co-authored-by: I'm a Github Action <beepboop@github.com>
Co-authored-by: Richard Tsai <RichtXO@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Wu <joshuawu3@gmail.com>

* beep boop Github Action Master Branch CI Prettier hard at work

* Bump lxml from 4.6.2 to 4.6.3 in /tests (#430)

Bumps [lxml](https://github.com/lxml/lxml) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/lxml/lxml/releases)
- [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt)
- [Commits](lxml/lxml@lxml-4.6.2...lxml-4.6.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump pyyaml from 5.3.1 to 5.4 in /tests (#434)

Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3.1 to 5.4.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](yaml/pyyaml@5.3.1...5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update ColorService.js

* Update ColorService.js

* Update ColorService.js

* Update ColorService.js

Co-authored-by: JaBeast13 <JaBeast13@users.noreply.github.com>
Co-authored-by: Richard Tsai <RichtXO@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Wu <joshuawu3@gmail.com>
Co-authored-by: I'm a Github Action <beepboop@github.com>
Co-authored-by: keerti-sundaram <70778626+keerti-sundaram@users.noreply.github.com>
Co-authored-by: Nicole Marie Gizzo <gizzon@rpi.edu>
Co-authored-by: Daniel Ackermans <35609442+marchdan@users.noreply.github.com>
  • Loading branch information
9 people authored Apr 8, 2021
1 parent 47233bd commit f054366
Showing 1 changed file with 31 additions and 8 deletions.
39 changes: 31 additions & 8 deletions src/web/src/services/ColorService.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,22 @@ import "@/typedef";
* @module ColorService
*/

//text and background should be very similar
//color should be a light shade of the color of text

const COLORS = [
"#ffd4df",
"#ceeffc",
"#fff4d0",
"#dcf7da",
"#f7e2f7",
"#ede6df",
"#ffe9cf",
"#ffd4df", //red
"#ceeffc", //blue
"#fff4d0", //yellow
"#dcf7da", //green
"#f7e2f7", //purple
"#ede6df", //brown
"#ffe9cf", //orange
"#ffd1fc", //pink
"#d9fdfc", //aquamarine
"#e2caca", //maroon
"#A3CFE1", //dark blue
"#ACDBA9", //dark green
];
const TEXT_COLORS = [
"#d1265d",
Expand All @@ -23,6 +31,15 @@ const TEXT_COLORS = [
"#853d80",
"#9d5733",
"#d9652b",
"#ff00ef",
"#00a499",
"#ab1111",
"#014779",
"#116940",
// make all black to help with visibility???
// apparently out site fails this test https://wave.webaim.org/
// which helps site stay accessible to people with disabilities
// add a switch to make the text black
];
const BORDER_COLORS = [
"#ff2066",
Expand All @@ -32,8 +49,14 @@ const BORDER_COLORS = [
"#d373da",
"#a48363",
"#ff9332",
"#ff00ef",
"#00fff9",
"#ab0000",
"#015FA2",
"#298E33",
];
const NUM_COLORS = 7;

const NUM_COLORS = 12;

// TODO: use something persistent
var assignmentIncr = 0;
Expand Down

0 comments on commit f054366

Please sign in to comment.