Merge branch 'master' into master

Author: MassiGy

Diff for: .github/workflows/aws.yml

@@ -0,0 +1,27 @@
+name: Deploy to Beanstalk
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout source code
+      uses: actions/checkout@v2
+
+    - name: Generate deployment package
+      run: zip -r deploy.zip . -x '*.git*'
+
+    - name: Deploy to EB
+      uses: einaregilsson/beanstalk-deploy@v20
+      with:
+        aws_access_key: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        application_name: backend-server
+        environment_name: Backendserver-env
+        version_label: ${{github.SHA}}
+        region: us-east-1
+        deployment_package: deploy.zip

Diff for: .gitignore

@@ -1,5 +1,4 @@
 node_modules
-Dockerfile
 OpenAPI.json
 .env
 database.db

Diff for: Dockerfile

@@ -0,0 +1,9 @@
+
+FROM node:12
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+ENV PORT=8080
+EXPOSE 8080
+CMD [ "npm", "start" ]

Diff for: src/index.js

@@ -10,13 +10,14 @@ const { removeUnconfirmedAccounts, emailConfirmationRemainder } = require('./job
 // Configure Local Variables
 const app = express();
 const port = process.env.PORT || 8080;
+const models = require('./models');
 
 // Configure Middleware
 app.use(express.static('public'));
 app.use(express.urlencoded({ extended: true }));
 app.use(express.json());
 app.use(require("cors")({
-  origin: ['https://fairfieldprogramming.org', 'http://localhost:8000/']
+    origin: "*"
 }));
 
 // Programs