Merge pull request #141 from ECN/staging

Update master to first beta release

.gitignore

@@ -8,15 +8,17 @@
 # Testing
 /coverage
 
-# Productiom
+# React Build Files
 /build
 
-# Misc
-.DS_Store
+# React local environment files
 .env.local
 .env.development.local
 .env.test.local
 .env.production.local
+
+# Misc
+.DS_Store
 .vscode/
 
 # Node Package Management
@@ -28,3 +30,4 @@ yarn-error.log*
 /api/venv
 __pycache__/
 venv-manager.log
+/api/.env

Dev Environment Setup Guide.md

@@ -252,4 +252,5 @@ All of the tools in this project are accessible as an npm task so you can intera
 | `kill:api` | Kills the runaway API process(es). |
 | `venv:create` | This will create a virtual environment in `/api/venv` and install requirements from `/api/requirements.txt`. |
 | `venv:delete` | This will delete the folder `/api/venv`. |
-| `venv:reset` | This will run `venv:delete` then `venv:create`. |
+| `venv:reset` | This will run `venv:delete` then `venv:create`. |
+| `venv:freeze` | Regenerates the API requirements.txt file and mitigates [this pip bug](https://github.com/pypa/pip/issues/4022). |

README.md

@@ -1,7 +1,7 @@
 # webqueue2
 A re-write of Purdue ECN's webqueue
 
-![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-09-22%20at%201.48.58%20PM.png)
+![UI Snapshot](./docs/UI%20Snapshots/UI-Snapshot%202020-12-03%20at%208.10.32%20PM.png)
 
 ## Stay Up To Date
 See what's being worked on with [the webqueue2 Project](https://github.itap.purdue.edu/ECN/webqueue2/projects/).