Merge Version 3.5.0 (#208)

Author: mxmeinhold

.gitignore

@@ -103,6 +103,9 @@ ENV/
 # JetBrains
 .idea/
 
+# vscode
+.vscode
+
 # Configurations
 config.py
 
@@ -128,3 +131,5 @@ packet/static/safari-pinned-tab.svg
 packet/static/site.webmanifest
 faviconData.json
 
+# csvs
+*.csv

.travis.yml

@@ -1,8 +1,16 @@
 language: python
 python:
   - "3.7"
+services:
+  - "docker"
 
 install:
   - "pip install -r requirements.txt"
+  - "curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.35.3/install.sh | bash"
+  - "nvm install"
+  - "nvm use"
+  - "npm install -g gulp"
+  - "npm install"
 script:
-  - "pylint --load-plugins pylint_quotes packet/routes packet"
+  - "gulp lint"
+  - "docker build -t packet ."

README.md

@@ -106,7 +106,7 @@ fail blocking you from merging. To make your life easier just run it before maki
 
 To run pylint use this command:
 ```bash
-pylint packet
+pylint --load-plugins  pylint_quotes packet/routes packet
 ```
 
 All python files should have a top-level docstring explaining the contents of the file and complex functions should 

frontend/scss/components/code.scss

@@ -0,0 +1,3 @@
+pre{
+    white-space: pre-wrap;
+}

frontend/scss/packet.scss

@@ -7,3 +7,4 @@ $csh-pink: #b0197e;
 @import "components/buttons";
 @import "components/signatures";
 @import "components/badges";
+@import "components/code";

frontend/scss/partials/_global.scss

@@ -103,4 +103,8 @@ tr {
 
 .eval-user-img {
   border-radius: 50%;
-}
+}
+
+select.form-control:not([size]):not([multiple]) {
+  height: calc(3rem + 2px);
+}

gulpfile.js/index.js

@@ -19,4 +19,5 @@ requireDir('./tasks', {recurse: true});
 
 // Default task
 gulp.task('default', gulp.parallel('css', 'js'));
-gulp.task('production', gulp.parallel('css', 'js', 'generate-favicon', 'pylint'));
+gulp.task('production', gulp.parallel('css', 'js', 'generate-favicon'));
+gulp.task('lint', gulp.parallel('pylint'));

gulpfile.js/tasks/pylint.js

@@ -2,7 +2,7 @@ const gulp = require('gulp');
 const exec = require('child_process').exec;
 
 let pylintTask = (cb) => {
-    exec('pylint packet', function (err, stdout, stderr) {
+    exec('pylint --load-plugins pylint_quotes packet/routes packet', function (err, stdout, stderr) {
         console.log(stdout);
         console.log(stderr);
         cb(err);

package.json

@@ -1,7 +1,7 @@
 {
   "title": "CSH Packet",
   "name": "csh-packet",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "A web app implementation of the CSH introductory packet.",
   "bugs": {
     "url": "https://github.com/ComputerScienceHouse/packet/issues",
@@ -20,10 +20,10 @@
   "devDependencies": {
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.2.0",
+    "gulp-minify": "^3.1.0",
     "gulp-real-favicon": "^0.3.2",
     "gulp-rename": "^1.4.0",
     "gulp-sass": "^4.0.2",
-    "gulp-minify": "^3.1.0",
     "require-dir": "^1.2.0"
   }
 }

packet/__init__.py

@@ -80,6 +80,7 @@
 
 if app.config['REALM'] == 'csh':
     from .routes import upperclassmen
+    from .routes import admin
 else:
     from .routes import freshmen