diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..504afef8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+package-lock.json
diff --git a/README.md b/README.md
index a5439fe5..e434219e 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,42 @@
# Aspine
-Who needs Aspen when you have Aspine! It serves as a one stop shop for everything Aspen related, and actually looks nice!
+Who needs Aspen when you have Aspine. It serves as a one stop shop for everything Aspen related, and there are rainbows!
## Getting Started
-Using Aspine is as easy as 1, 2, 3. Just visit aspine.us and login with your Aspen credientials!
+Using Aspine is as easy as 1, 2, 3. Just visit aspine.us and login with your Aspen credentials.
## Features
-* Everything Aspen, but better!
+* Aesthetic Grade Checking
* CRLS Clock
+
+
* Grade Comparison via boxplot
+
+
* Calendar
+
+
* Chat with your classmates (coming soon...)
+## FAQ
+
+##### How are usernames and passwords handled?
+
+Aspine does not store any usernames or passwords.
+
+##### How are calculated grades computed?
+
+First, calculated category percentages are computed by dividing a student's total earned points within a category by the total available points for that category. Then, the category percentages are multiplied by their respective weights and summed in order to produce the calculated grade for a class.
+
+Note:
+* Assignments scored with free text (i.e. "Missing", "Exempt") are ignored during grade computation. (Improvements coming soon)
+* Due to the mysterious workings of Aspen, it is impossible to achieve 100% accuracy when making grade prediction calculations. That being said, Aspine's cutting edge grade calcuation algorithm is unmatched.
+
## Built With
* [Tabulator](https://github.com/olifolkerd/tabulator)
@@ -28,6 +48,17 @@ Using Aspine is as easy as 1, 2, 3. Just visit aspine.us and login with your Asp
Feel free to suggest an enhancement or post a bug issue either via github issues or this [google form](https://goo.gl/forms/PYQDtzkp0vHJbFLz2)!
+If you would like to directly contribute to Aspine, you can fork this repository and clone your fork on your computer with a [git](https://git-scm.com/) client. To test your additions to Aspine:
+
+* Make sure that you have installed [node.js](https://nodejs.org/), npm, and [redis](https://redis.io/).
+ * On Windows or macOS, download node.js and redis from their websites, and install them.
+ * On GNU+Linux, you should be able to find these in your package manager (e.g. `apt`/`dpkg`, `yum`/`dnf`, `zypper`, `pacman`). npm may be in a separate package from node.js.
+* Open a terminal or command prompt, navigate to the directory in which you cloned the Aspine git repository, and run `redis-server redis.conf`.
+* Open another terminal or command prompt, navigate to that same directory, and run `npm install` to install the required dependencies.
+* In the same terminal or command prompt, run `node ./serve.js insecure`, or `node ./serve.js insecure fake` to use the `sample.json` file instead of pulling from Aspen (for faster testing).
+
+These instructions have only been tested on GNU+Linux. You might need to change your `PATH` on Windows if you get an error saying that `node` is not found after installing node.js.
+
## Authors
* [**Max Katz-Christy**](https://github.com/maxtkc)
@@ -36,7 +67,7 @@ Feel free to suggest an enhancement or post a bug issue either via github issues
## [Color Scheme](http://paletton.com/#uid=12W0u0kw0e-n8nFrjj8Hz9QS55d)
-
+
```
Primary Color: #00551D
@@ -47,6 +78,26 @@ Secondary Colors:
- #001E0A
```
+#### Grade Lettering and Coloring
+
+| Grade Range | Letter | Primary Color | Secondary Color |
+| :----------- |:--------------|:------ |:------ |
+| 96.5 - 100 | A+ |#1E8541 |#3d995c |
+| 92.5 - 96.4 | A |#1E8541 |#3d995c |
+| 89.5 - 92.4 | A- |#1E8541 |#3d995c |
+| 86.5 - 89.4 | B+ |#6666FF |#a3a3f5 |
+| 82.5 - 86.4 | B |#6666FF |#a3a3f5 |
+| 79.5 - 82.4 | B- |#6666FF |#a3a3f5 |
+| 76.5 - 79.4 | C+ |#ff9900 |#eba947 |
+| 72.5 - 76.4 | C |#ff9900 |#eba947 |
+| 69.5 - 72.4 | C- |#ff9900 |#eba947 |
+| 66.5 - 69.4 | D+ |Orange |#ebb147 |
+| 62.5 - 66.4 | D |Orange |#ebb147 |
+| 59.5 - 62.4 | D- |Orange |#ebb147 |
+| 0 - 59.4 | F |Red |#eb4747 |
+
+
+
## License
-This project is licensed under the GNU License - see the [LICENSE.md](LICENSE.md) file for details
+This project is licensed under the GNU General Public License, version 3 - see the [LICENSE.md](LICENSE.md) file for details.
diff --git a/db/dump.rdb b/db/dump.rdb
index 83f1a53a..ad379d18 100644
Binary files a/db/dump.rdb and b/db/dump.rdb differ
diff --git a/package.json b/package.json
index 2b8831b7..92dfeac3 100644
--- a/package.json
+++ b/package.json
@@ -7,18 +7,24 @@
"body-parser": "^1.18.3",
"cheerio": "^1.0.0-rc.2",
"compression": "^1.7.4",
+ "concat-stream": "^2.0.0",
"connect-redis": "^3.4.0",
+ "encoding": "^0.1.12",
"express": "^4.16.4",
"express-session": "^1.15.6",
"fullcalendar": "^3.10.0",
+ "gulp": "^4.0.0",
"http-server": "^0.11.1",
"jquery": "^3.3.1",
+ "memfs": "^2.15.2",
+ "memory-streams": "^0.1.3",
"minimist": "^1.2.0",
"moment": "^2.24.0",
"node-fetch": "^2.3.0",
"prompt": "^1.0.0",
"redis": "^2.8.0",
"request": "^2.88.0",
+ "selenium-webdriver": "^4.0.0-alpha.1",
"socket.io": "^2.2.0",
"validator": "^10.11.0"
},
diff --git a/public/css/stylesheet.css b/public/css/stylesheet.css
index 507ddfac..e9da62cd 100644
--- a/public/css/stylesheet.css
+++ b/public/css/stylesheet.css
@@ -277,7 +277,7 @@ form.login100-form {
color: black;
}
-i.fa.fa-plus {
+i.fa.fa-plus.grades {
color: #00551C;
padding-left: 31%;
padding-top: 25%;
@@ -290,7 +290,7 @@ i.fa.fa-info-circle {
padding-left: 31%;
padding-top: 25%;
font-size: large;
- cursor: pointer;
+ cursor: default;
}
i.fa.fa-eye-slash {
@@ -581,3 +581,93 @@ input#calendar-add-submit:hover {
p#add-calendar-error {
color: red;
}
+
+
+
+/* Add a black background color to the top navigation */
+.topnav {
+ background-color: #333;
+ overflow: visible;
+ height: 41px;
+}
+
+/* Style the links inside the navigation bar */
+.topnav span.right {
+ float: right;
+ color: #f2f2f2;
+ text-align: center;
+ padding: 10px 16px;
+ text-decoration: none;
+ font-size: 14px;
+}
+
+/* Change the color of links on hover */
+.topnav span.right.hover:hover {
+ background-color: #555;
+ color: #f2f2f2;
+}
+
+
+/* The container must be positioned relative: */
+.custom-select {
+ position: relative;
+ font-family: Arial;
+ float: left;
+}
+
+.custom-select select {
+ display: none; /*hide original SELECT element: */
+}
+
+.select-selected {
+ background-color: DodgerBlue;
+}
+
+/* Style the arrow inside the select element: */
+.select-selected:after {
+ position: absolute;
+ content: "";
+ top: 17px;
+ right: 10px;
+ width: 0;
+ height: 0;
+ border: 6px solid transparent;
+ border-color: #fff transparent transparent transparent;
+}
+
+/* Point the arrow upwards when the select box is open (active): */
+.select-selected.select-arrow-active:after {
+ border-color: transparent transparent #fff transparent;
+ top: 10px;
+}
+
+/* style the items (options), including the selected item: */
+.select-items div,.select-selected {
+ color: #ffffff;
+ padding: 10px 16px;
+ border: 1px solid transparent;
+ border-color: transparent transparent rgba(0, 0, 0, 0.1) transparent;
+ cursor: pointer;
+}
+
+/* Style items (options): */
+.select-items {
+ position: absolute;
+ background-color: DodgerBlue;
+ top: 100%;
+ left: 0;
+ right: 0;
+ z-index: 99;
+}
+
+/* Hide the items when the select box is closed: */
+.select-hide {
+ display: none;
+}
+
+.select-items div:hover, .same-as-selected {
+ background-color: rgba(0, 0, 0, 0.1);
+}
+
+
+
diff --git a/public/home.html b/public/home.html
index 9b0308d0..7423536e 100644
--- a/public/home.html
+++ b/public/home.html
@@ -1,9 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
Aspine | CRLS Student Dashboard
@@ -27,9 +44,9 @@
-
-
-
+
+
+
@@ -43,6 +60,11 @@
+
+
+
+
+
@@ -63,23 +85,52 @@