Merging dev with master

Author: js324

.gitignore

@@ -4,6 +4,7 @@ logs
 
 # config cache
 config.prod.py
+config.dev.py
 config.test.py
 config.py
 
@@ -36,4 +37,4 @@ client_secret.json
 
 .serverless/*
 package-lock.json
-node_modules/**
+node_modules/**

.python-version

@@ -1 +1 @@
-3.6.6/envs/lcs-venv
+3.9.1/envs/lcs-venv

.travis.yml

@@ -3,7 +3,7 @@ language: python
 
 #Set up the basic environment to be python
 python:
-  - "3.6.6"
+  - "3.9.1"
 
 #Recognize mongodb as a service
 services:

Dockerfile

@@ -0,0 +1,35 @@
+# Credit to Kirollos and Anarav for work on Dockerfile
+# Commands to build and run using this Dockerfile
+# docker pull nikolaik/python-nodejs:python3.9-nodejs14
+# docker build -t lcs .
+# docker run -p 3000:3000 -p 3001:3001 -p 3002:3002 -it --name serverless lcs
+
+# if you make changes do not hesistate to run docker rm serverless 
+# followed by the docker build and docker run commands to test out your changes!
+
+# Setup base image for python and nodejs
+FROM nikolaik/python-nodejs:python3.9-nodejs16
+
+
+# And our requirements, and install them
+ADD requirements.txt /
+RUN pip3 install -r requirements.txt
+
+# Add package and package-lock to determine required dependencies
+ADD package.json /
+
+# Install the node packages outlined in package-lock.json (if present) or package.json
+RUN npm install
+RUN npm install -g serverless
+
+# Add serverless.yml for lambda functions
+ADD serverless.yml /
+
+# Add all of our python files
+ADD *.py /
+ADD ./templates /templates
+ADD ./src /src  
+
+# Run serverless offline
+EXPOSE 3000
+ENTRYPOINT ["node_modules/.bin/sls", "offline", "--host", "0.0.0.0", "start"]

config.example.py

@@ -13,8 +13,9 @@
     'channel': ''
 }
 
-SPARKPOST_KEY = ""
-
+EMAIL_ADDRESS = ""
+#Must use a generated app password for gmail
+EMAIL_PASSWORD = ""
 
 class GOOGLE_CAL:
     CAL_ID = ""

config.travis.py

@@ -12,6 +12,9 @@
     "slack messages": "slackMessages"
 }
 
+EMAIL_ADDRESS = os.getenv("TRAVIS_TEST_EMAIL_ADDRESS")
+EMAIL_PASSWORD = os.getenv("TRAVIS_TEST_EMAIL_PASSWORD")
+
 SPARKPOST_KEY = os.getenv("TRAVIS_SPARKPOST_KEY", "")
 
 SLACK_KEYS = {

deployment/config.dev.py

@@ -18,6 +18,8 @@
     'channel': os.getenv("DEVELOP_SLACK_CHANNEL_ID")
 }
 
+EMAIL_ADDRESS = os.getenv("DEVELOP_EMAIL_ADDRESS"),
+EMAIL_PASSWORD = os.getenv("DEVELOP_EMAIL_PASSWORD")
 
 class GOOGLE_CAL:
     CAL_ID = os.getenv("DEVELOP_GOOGLE_CAL_ID", "")
@@ -55,7 +57,7 @@ class GOOGLE_CAL:
 }
 RESUME_BUCKET = os.getenv("DEVELOP_RESUME_BUCKET", "")
 WAIVER_BUCKET = os.getenv("DEVELOP_WAIVER_BUCKET", "")
-
+VACCINE_BUCKET = os.getenv("DEVELOP_VACCINE_BUCKET", "")
 # Json webtoken
 JWT_SECRET = os.getenv("DEVELOP_JWT_SECRET", "")
 JWT_ALGO = os.getenv("DEVELOP_JWT_ALGO", "")

deployment/config.prod.py

@@ -19,6 +19,9 @@
     'channel': os.getenv("PRODUCTION_SLACK_CHANNEL_ID")
 }
 
+EMAIL_ADDRESS = os.getenv("PRODUCTION_EMAIL_ADDRESS"),
+EMAIL_PASSWORD = os.getenv("PRODUCTION_EMAIL_PASSWORD")
+
 class GOOGLE_CAL:
     CAL_ID = os.getenv("PRODUCTION_GOOGLE_CAL_ID", "")
     CAL_API_KEY = os.getenv("PRODUCTION_GOOGLE_CAL_API_KEY", "")

deployment/deploy_develop.sh

@@ -21,8 +21,11 @@ declare -a env_vars=(
  "DEVELOP_SLACK_CHANNEL_ID"
  "DEVELOP_RESUME_BUCKET"
  "DEVELOP_WAIVER_BUCKET"
+ "DEVELOP_VACCINE_BUCKET"
  "DEVELOP_AWS_ACCESS_KEY_ID"
- "DEVELOP_AWS_SECRET_ACCESS_KEY")
+ "DEVELOP_AWS_SECRET_ACCESS_KEY"
+ "DEVELOP_EMAIL_ADDRESS"
+ "DEVELOP_EMAIL_PASSWORD")
 
 echo "For loop"
 # Disabled environment variables:
@@ -39,6 +42,15 @@ do
    printenv $i >> .env.dev
 done
 
+wget https://raw.githubusercontent.com/creationix/nvm/v0.31.0/nvm.sh -O ~/.nvm/nvm.sh;
+source ~/.nvm/nvm.sh;
+
+nvm use 14
+
+##Checking Package Versions
+echo "Checking Node..."
+node -v
+
 # Deploying!
 echo "Deploying!"
-npx serverless deploy --stage dev 
+npx serverless deploy --stage dev 

deployment/deploy_production.sh

@@ -38,7 +38,9 @@ declare -a env_vars=(
  "PRODUCTION_DAY_OF_END_YEAR"  
  "PRODUCTION_DAY_OF_END_MONTH"
  "PRODUCTION_DAY_OF_END_DAY"  
- "PRODUCTION_DAY_OF_END_HOUR")
+ "PRODUCTION_DAY_OF_END_HOUR"
+ "PRODUCTION_EMAIL_ADDRESS"
+ "PRODUCTION_EMAIL_PASSWORD")
 
 echo "For loop"
 # Disabled environment variables