diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index bf9f0047..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: 2 # use CircleCI 2.0 -jobs: # a collection of steps - build: # runs not using Workflows must have a `build` job as entry point - working_directory: ~/mern-starter # directory where steps will run - docker: # run the steps with Docker - - image: circleci/node:10.13 - - image: mongo:3.6.7-stretch - steps: # a collection of executable commands - - checkout # special step to check out source code to working directory - - run: - name: install-mongo-cli - command: 'sudo apt update && sudo apt-get install mongodb-clients' - - run: - name: mongo-test-db - command: 'mongorestore -d ecg-myr __tests__/mongo' - - run: - name: update-npm - command: 'sudo npm install -g npm@latest' - - restore_cache: # special step to restore the dependency cache - key: dependency-cache-{{ checksum "package.json" }} - - run: - name: install-npm-wee - command: npm install - - save_cache: # special step to save the dependency cache - key: dependency-cache-{{ checksum "package.json" }} - paths: - - ./node_modules - # - run: # run server - # name: Start server - # command: npm start - # background: true - # - run: # wait for server to start - # name: making sure server had time to start - # command: sleep 15 - - run: # run tests - name: test - command: CI=true npm test - # - run: # run coverage report - # name: code-coverage - # command: './node_modules/.bin/nyc report --reporter=text-lcov' - # - store_artifacts: # special step to save test results as as artifact - # path: test-results.xml - # prefix: tests - # - store_artifacts: - # path: coverage - # prefix: coverage - # - store_test_results: # special step to upload test results for display in Test Summary - # path: test-results.xml - # See https://circleci.com/docs/2.0/deployment-integrations/ for deploy examples diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..b512c09d --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..5746a63f --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.github/workflows/deploy_beta.yml b/.github/workflows/deploy_beta.yml new file mode 100644 index 00000000..f52ceb02 --- /dev/null +++ b/.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/branch-name@v1.0.1 + - 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 \ No newline at end of file diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml new file mode 100644 index 00000000..543abc04 --- /dev/null +++ b/.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/branch-name@v1.0.1 + - 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 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..3f9e085e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM node:10.13 + +WORKDIR /app +COPY . /app + +RUN npm install \ No newline at end of file diff --git a/public/about/team/index.html b/public/about/team/index.html index 939b1dc6..5d275ab0 100644 --- a/public/about/team/index.html +++ b/public/about/team/index.html @@ -110,26 +110,20 @@

MYR Development Team

- + -
Jason Kiesling
+
Keith Valin

Lead Developer

-

B.S. Computer Science 2021
+
B.S. Computer Science 2022

- - - - - - - + - +

@@ -208,6 +202,38 @@
Patrick Sullivan

Alumni

+
+
+ + + + +
+ + +
Jason Kiesling
+

+ Lead Developer 2019-2020 +

+

+

B.S. Computer Science 2021
+
+ + + + + + + + + + + + +

+
+
+
@@ -240,6 +266,8 @@
Chris Berns
+
+
@@ -272,8 +300,6 @@
Elena Izotova
-
-
@@ -304,6 +330,8 @@
Vrinda Punj
+
+
@@ -327,8 +355,6 @@
Sam Dodson
-
-
diff --git a/public/img/textures/bark.jpg b/public/img/textures/bark.jpg index 05280357..a07f56be 100644 Binary files a/public/img/textures/bark.jpg and b/public/img/textures/bark.jpg differ diff --git a/public/img/textures/bricks.jpg b/public/img/textures/bricks.jpg index 1b0612b6..c791d40f 100644 Binary files a/public/img/textures/bricks.jpg and b/public/img/textures/bricks.jpg differ diff --git a/public/img/textures/grass.jpg b/public/img/textures/grass.jpg index 6ce207eb..682d1648 100644 Binary files a/public/img/textures/grass.jpg and b/public/img/textures/grass.jpg differ diff --git a/public/img/textures/paint.jpg b/public/img/textures/paint.jpg index c2cdac6f..186a6f19 100644 Binary files a/public/img/textures/paint.jpg and b/public/img/textures/paint.jpg differ diff --git a/public/img/textures/rug.jpg b/public/img/textures/rug.jpg index 66e9a13e..48a7a093 100644 Binary files a/public/img/textures/rug.jpg and b/public/img/textures/rug.jpg differ