Merge pull request engaging-computing#216 from engaging-computing/dev

2.3.0 backend

.dockerignore

@@ -0,0 +1 @@
+node_modules

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: Build MYR
+
+on: [push, pull_request]
+
+jobs:
+  ci-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '10.13'
+      - name: Setup cache
+        uses: actions/cache@v2
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Fetch packages
+        run: npm ci
+      - name: Setup Test Environment
+        run: |
+          docker-compose up -d database
+          docker-compose up database_seed
+      - name: Run unit tests 
+        run: npm test -- --forceExit
+      - name: Tear down test environment
+        run: |
+          docker-compose down

.github/workflows/deploy_beta.yml

@@ -0,0 +1,28 @@
+name: Deploy MYR
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  update_upstream:
+    runs-on: ubuntu-latest
+    container:
+      image: docker
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set the branch variable
+        uses: nelonoel/[email protected]
+      - name: Log into Quay
+        run: docker login quay.io -u umlecg+myr_bot -p ${{ secrets.QUAY_BOT_PASSWORD }}
+      - name: Build the docker image
+        run: docker build -t quay.io/umlecg/myr-backend:${BRANCH_NAME} .
+      - name: Push the new image
+        run: docker push quay.io/umlecg/myr-backend:${BRANCH_NAME}
+      - name: Notify the build repository
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.MYR_ACCESS_TOKEN }}
+          event-type: update_dev
+          repository: engaging-computing/MYR-build

.github/workflows/deploy_prod.yml

@@ -0,0 +1,28 @@
+name: Deploy production MYR
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_upstream:
+    runs-on: ubuntu-latest
+    container:
+      image: docker
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set the branch variable
+        uses: nelonoel/[email protected]
+      - name: Log into Quay
+        run: docker login quay.io -u umlecg+myr_bot -p ${{ secrets.QUAY_BOT_PASSWORD }}
+      - name: Build the docker image
+        run: docker build -t quay.io/umlecg/myr-backend:${BRANCH_NAME} .
+      - name: Push the new image
+        run: docker push quay.io/umlecg/myr-backend:${BRANCH_NAME}
+      - name: Notify the build repository
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.MYR_ACCESS_TOKEN }}
+          event-type: update_master
+          repository: engaging-computing/MYR-build

Dockerfile

@@ -0,0 +1,6 @@
+FROM node:10.13
+
+WORKDIR /app
+COPY . /app
+
+RUN npm install

public/about/team/index.html

@@ -110,26 +110,20 @@ <h4 class="text-center ">MYR Development Team</h4>
             <table>
               <tr>
                 <td>
-                  <img class="team-photo " src="/img/team/jason_kiesling.jpg ">
+                  <img class="team-photo " src="/img/team/male.png ">
                 </td>
                 <td>
-                  <h5 class="card-title ">Jason Kiesling</h5>
+                  <h5 class="card-title ">Keith Valin</h5>
                   <p class="team-title ">
                     Lead Developer
                   </p>
                   <p class="card-text ">
-                    <div class="team-degree ">B.S. Computer Science 2021</div>
+                    <div class="team-degree ">B.S. Computer Science 2022</div>
                     <br />
-                    <a href="mailto:[email protected] " target="_blank " class="icons-hover-link">
-                      <i class="far fa-envelope team-icons "></i>
-                    </a>
-                    <a href="http://jasondkiesling.com " target="_blank " class="icons-hover-link">
-                      <i class="fas fa-link team-icons "></i>
-                    </a>
-                    <a href="https://www.linkedin.com/in/jasondkiesling/ " target="_blank " class="icons-hover-link">
+                    <a href="https://www.linkedin.com/in/keith-valin-8b670b120/" target="_blank " class="icons-hover-link">
                       <i class="fab fa-linkedin team-icons "></i>
                     </a>
-                    <a href="https://github.com/jasondkiesling " target="_blank " class="icons-hover-link">
+                    <a href="https://github.com/kdvalin " target="_blank " class="icons-hover-link">
                       <i class="fab fa-github team-icons "></i>
                     </a>
                   </p>
@@ -208,6 +202,38 @@ <h5 class="card-title ">Patrick Sullivan</h5>
       <hr />
       <h4 class="text-center ">Alumni</h4>
       <div class="row team-card ">
+        <div class="card info-card col-lg-5 col-sm-12 mr-auto ">
+          <div class="card-body ">
+            <table>
+              <tr>
+                <td>
+                  <img class="team-photo " src="/img/team/jason_kiesling.jpg ">
+                </td>
+                <td>
+                  <h5 class="card-title ">Jason Kiesling</h5>
+                  <p class="team-title ">
+                    Lead Developer 2019-2020
+                  </p>
+                  <p class="card-text ">
+                    <div class="team-degree ">B.S. Computer Science 2021</div>
+                    <br />
+                    <a href="mailto:[email protected] " target="_blank " class="icons-hover-link">
+                      <i class="far fa-envelope team-icons "></i>
+                    </a>
+                    <a href="http://jasondkiesling.com " target="_blank " class="icons-hover-link">
+                      <i class="fas fa-link team-icons "></i>
+                    </a>
+                    <a href="https://www.linkedin.com/in/jasondkiesling/ " target="_blank " class="icons-hover-link">
+                      <i class="fab fa-linkedin team-icons "></i>
+                    </a>
+                    <a href="https://github.com/jasondkiesling " target="_blank " class="icons-hover-link">
+                      <i class="fab fa-github team-icons "></i>
+                    </a>
+                  </p>
+                </td>
+            </table>
+          </div>
+        </div>
         <div class="card info-card col-lg-5 col-sm-12 mr-auto ">
           <div class="card-body ">
             <table>
@@ -240,6 +266,8 @@ <h5 class="card-title ">Chris Berns</h5>
             </table>
           </div>
         </div>
+      </div>
+      <div class="row team-card ">
         <div class="card info-card col-lg-5 col-sm-12 mr-auto ">
           <div class="card-body ">
             <table>
@@ -272,8 +300,6 @@ <h5 class="card-title ">Elena Izotova</h5>
             </table>
           </div>
         </div>
-      </div>
-      <div class="row team-card ">
         <div class="card info-card col-lg-5 col-sm-12 mr-auto ">
           <div class="card-body ">
             <table>
@@ -304,6 +330,8 @@ <h5 class="card-title ">Vrinda Punj</h5>
             </table>
           </div>
         </div>
+      </div>
+      <div class="row team-card ">
         <div class="card info-card col-lg-5 col-sm-12 mr-auto ">
           <div class="card-body ">
             <table>
@@ -327,8 +355,6 @@ <h5 class="card-title ">Sam Dodson</h5>
             </table>
           </div>
         </div>
-      </div>
-      <div class="row team-card ">
         <div class="card info-card col-lg-5 col-sm-12 mr-auto ">
           <div class="card-body ">
             <table>