Merge branch 'dev' of https://github.com/engaging-computing/MYR into random-color

Author: Jlu18

.circleci/config.yml

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

.dockerignore

@@ -0,0 +1,25 @@
+name: Build MYR
+
+on: [push, pull_request]
+
+jobs:
+  ci-checks:
+    runs-on: ubuntu-latest
+    container:
+      image: node:10.13
+    
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup cache
+        uses: actions/cache@v2
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+      - name: Fetch packages
+        run: npm install
+      - name: Run Linter
+        run: npm run lint
+      - name: Run unit tests 
+        run: npm test
+      - name: Build production build
+        run: npm run build

.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: Deploy staging image
+
+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-frontend:${BRANCH_NAME} --build-arg REACT_APP_GOOGLE_CLIENTID=${{ secrets.MYR_GOOGLE_OAUTH2 }} .
+      - name: Push the new image
+        run: docker push quay.io/umlecg/myr-frontend:${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_beta.yml

@@ -0,0 +1,28 @@
+name: Deploy production image
+
+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-frontend:${BRANCH_NAME} --build-arg REACT_APP_GOOGLE_CLIENTID=${{ secrets.MYR_GOOGLE_OAUTH2 }} .
+      - name: Push the new image
+        run: docker push quay.io/umlecg/myr-frontend:${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

.github/workflows/deploy_prod.yml

@@ -14,9 +14,6 @@
 # api keys
 /src/keys
 
-# doc scripts
-GenerateDocsWindows.bat
-
 # misc
 .DS_Store
 .env*

.gitignore

@@ -0,0 +1,11 @@
+FROM node:10.13
+
+WORKDIR /app
+COPY . /app
+
+ARG REACT_APP_GOOGLE_CLIENTID="totally invalid.apps.googleusercontent.com"
+ENV REACT_APP_GOOGLE_CLIENTID ${REACT_APP_GOOGLE_CLIENTID}
+
+RUN npm install
+RUN npm run build
+RUN npm run doc

Dockerfile

@@ -9,10 +9,10 @@ The Engaging Computing Group develops new technologies to enable learners—yout
 ## Status
 [![CircleCI](https://circleci.com/gh/engaging-computing/MYR.svg?style=shield)](https://circleci.com/gh/engaging-computing/MYR)
 
-## Change Log - 2.1.1 -> 2.2.0
-- Adds Lighting features to MYR
-- Adds Texture features to MYR
-- Updates copyright in the footer to be in the form `2018 - <current year>`
+## Change Log - 2.3.1 -> 2.4.0
+- Added ability to import custom GLTF models into a scene
+- Added a keyboard shortcut information menu
+- Added a slider for setting the movement speed in a scene
 
 
 ## Acknowledgments

README.md

@@ -0,0 +1,10 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 500
+Ka 0.8 0.8 0.8
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2