Merge pull request #110 from oslabs-beta/master

Spearmint Release v0.7.0

Author: ericgpark

.dockerignore

@@ -0,0 +1,7 @@
+node_modules
+Dockerfile
+.git
+.gitignore
+.dockerignore
+.env
+package-lock.json

.eslintignore

@@ -1 +1,7 @@
-node_modules
+node_modules
+
+*.js
+
+*.tsx
+
+*.jsx

.gitignore

@@ -1,30 +1,34 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-/dist
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-.env
-
-/package-lock.json
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-
-#configuration
-.vscode
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+/dist
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+.env
+
+/package-lock.json
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+
+#configuration
+.vscode
+
+
+/server/node_modules
+/server/spearmint.zip

Dockerfile

@@ -0,0 +1,17 @@
+FROM node:14
+RUN apt-get update && apt-get install \
+    git libx11-xcb1 libxcb-dri3-0 libxtst6 libnss3 libatk-bridge2.0-0 libgtk-3-0 libxss1 libasound2 \
+    -yq --no-install-suggests --no-install-recommends \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN useradd -d /spearmint spearmint
+USER spearmint
+WORKDIR /spearmint
+COPY package.json .
+RUN npm run install-once 
+COPY . .
+EXPOSE 3000
+USER root
+RUN chown root /spearmint/node_modules/electron/dist/chrome-sandbox
+RUN chmod 4755 /spearmint/node_modules/electron/dist/chrome-sandbox
+USER spearmint
+CMD ["npm", "start"]

README.md

@@ -38,11 +38,11 @@ In an Administrator PowerShell run the following commands: <br />
 # How it works
 
 
-1.  On the initial screen, load your application to start creating tests.
+1.  On the initial screen, a user is prompt to login or sign up (via OAuth or standard sign-up/login). Once logged in choose your file and load your application to start creating tests.
 
 ![](/public/mainPage.png)
 
-2.  Utilize our auto-complete, drop-down options, and tooltips features to easily create arrangement, action, and assertion test statements for React; reducer, action creator, asynchronous action creator, and middleware test statements for Redux; and hooks, context, and endpoint test statements.
+2.  Utilize our auto-complete, drop-down options, and tooltips features to easily create arrangement, action, and assertion test statements for React; reducer, action creator, asynchronous action creator, and middleware test statements for Redux; and hooks, context, and endpoint test statements. Spearmint can save test templates for future use for logged in user. 
 
 ![](/public/generateTest.png)
 
@@ -55,6 +55,16 @@ In an Administrator PowerShell run the following commands: <br />
 5.  Accessibility lens have been added in the app to give developers with different mismatches various options to interact with the app. 
 ![](/public/AccLens_Demo.gif)
 
+# New features with version 0.7.0
+
+-Sign-up and Login
+
+-OAuth Login available through GitHub
+
+-Save test states
+
+-**NEW** Accessibility lenses for Low-vision and light sensitivity
+
 <br>
 
 
@@ -76,6 +86,7 @@ In an Administrator PowerShell run the following commands: <br />
 > Cornelius [@corneeltron](https://github.com/corneeltron)  &nbsp;&middot;&nbsp;
 > Dave [@davefranz](https://github.com/davefranz) &nbsp;&middot;&nbsp;
 > Dieu [@dieunity](https://github.com/dieunity) &nbsp;&middot;&nbsp;
+> Eric [@ericgpark](https://github.com/ericgpark) &nbsp;&middot;&nbsp;
 > Evan [@Berghoer](https://github.com/Berghoer) &nbsp;&middot;&nbsp; <br />
 > Gabriel [@bielchristo](https://github.com/bielchristo)
 > Johnny [@johnny-lim](https://github.com/johnny-lim) &nbsp;&middot;&nbsp;
@@ -84,15 +95,18 @@ In an Administrator PowerShell run the following commands: <br />
 > Karen [@karenpinilla](https://github.com/karenpinilla) &nbsp;&middot;&nbsp; <br />
 > Linda [@lcwish](https://github.com/lcwish) &nbsp;&middot;&nbsp;
 > Luis [@Luis-KM-Lo](https://github.com/Luis-KM-Lo) &nbsp;&middot;&nbsp;
-> Max [@MaxWeisen](https://github.com/MaxWeisen) &nbsp;&middot;&nbsp;
+> Max B[@mbromet](https://github.com/mbromet) &nbsp;&middot;&nbsp;
+> Max W [@MaxWeisen](https://github.com/MaxWeisen) &nbsp;&middot;&nbsp;
 > Mike [@mbcoker](https://github.com/mbcoker) &nbsp;&middot;&nbsp;
 > Mo [@mhmaidi789](https://github.com/mhmaidi789) &nbsp;&middot;&nbsp; <br />
 > Natlyn [@natlynp](https://github.com/natlynp) &nbsp;&middot;&nbsp; 
 > Nick [@nicolaspita](https://github.com/nicolaspita) &nbsp;&middot;&nbsp;
 > Rachel [@rachethecreator](https://github.com/rachethecreator) &nbsp;&middot;&nbsp;
-> Sean [@sean-haverstock](https://github.com/Sean-Haverstock) &nbsp;&middot;&nbsp; <br />
+> Sean Y [@seanyyoo](https://github.com/seanyyoo)&nbsp;&middot;&nbsp;
+> Sean H [@sean-haverstock](https://github.com/Sean-Haverstock) &nbsp;&middot;&nbsp; <br />
 > Sharon [@sharon-zhu](https://github.com/sharon-zhu) &nbsp;&middot;&nbsp; 
 > Sieun [@sieunjang](https://github.com/sieunjang) &nbsp;&middot;&nbsp;
 > Tolan [@taoantaoan](https://github.com/taoantaoan) &nbsp;&middot;&nbsp;
-> Tristen [@twastell](https://github.com/twastell) 
+> Tristen [@twastell](https://github.com/twastell) &nbsp;&middot;&nbsp;
+> Tyler [@tytyjameson](https://github.com/tytyjameson)
 <hr>

docker-compose.yml

@@ -0,0 +1,24 @@
+version: '3'
+services:
+  frontend:
+    container_name: frontend
+    image: frontend
+    security_opt:
+      - seccomp=profile.json
+    environment:
+      - DISPLAY=host.docker.internal:0
+    stdin_open: true
+    ports: 
+      - "3000:3000"
+    networks:
+      - spearmint
+  backend:
+    container_name: backend
+    image: backend
+    ports:
+      - "3001:3001"
+    networks:
+      - spearmint
+networks:
+  spearmint:
+    driver: bridge

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spearmint",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "An open-source developer tool that simplifies testing and hopes to help increase awareness about web accessibility.",
   "author": "team spearmint",
   "build": {
@@ -28,26 +28,38 @@
   "homepage": "./",
   "private": true,
   "dependencies": {
-    "@material-ui/core": "^4.11.3",
+    "@capacitor/cli": "^3.0.1",
+    "@capacitor/core": "^3.0.1",
+    "@capacitor/screen-reader": "^1.0.1",
+    "@material-ui/core": "^4.11.4",
     "@material-ui/icons": "^4.11.2",
     "@types/jest": "^25.2.3",
     "@types/react-beautiful-dnd": "^12.1.2",
     "@types/react-dom": "^16.9.8",
     "@types/react-modal": "^3.10.5",
+    "bcrypt": "^5.0.1",
     "classnames": "^2.2.6",
     "concurrently": "^4.1.2",
+    "cookie-parser": "^1.4.5",
     "cross-env": "^5.2.1",
-    "dotenv": "^8.2.0",
+    "dotenv": "^8.6.0",
+    "electron-deeplink": "^1.0.6",
     "electron-is-dev": "^1.1.0",
+    "express": "^4.17.1",
     "fibers": "^5.0.0",
     "fix-path": "^3.0.0",
+    "install": "^0.13.0",
     "js-beautify": "^1.10.0",
     "monaco-editor": "^0.17.0",
+    "mongoose": "^5.12.14",
+    "node-fetch": "^2.6.1",
     "node-pty": "^0.10.0",
     "react": "^16.8.6",
     "react-autosuggest": "^9.4.3",
     "react-beautiful-dnd": "^11.0.3",
     "react-dom": "^16.8.6",
+    "react-google-login": "^5.2.2",
+    "react-login-github": "^1.0.7",
     "react-modal": "^3.8.1",
     "react-monaco-editor": "^0.25.1",
     "react-scripts": "^3.4.1",
@@ -72,8 +84,8 @@
     "electron-rebuild": "electron-rebuild -f -w node-pty",
     "postinstall": "electron-builder install-app-deps",
     "release": "npm run react-build && electron-builder --publish=always",
-    "start-windows": "cross-env NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\"",
-    "start": "NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\""
+    "start-windows": "cross-env NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\" \"nodemon server/server.js\"",
+    "start": "NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\" \"nodemon server/server.js\""
   },
   "browserslist": {
     "production": [
@@ -95,6 +107,7 @@
     "@types/jest": "^25.2.3",
     "@typescript-eslint/eslint-plugin": "^2.33.0",
     "@typescript-eslint/parser": "^2.33.0",
+    "@vue/test-utils": "^1.2.1",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "electron": "^12.0.5",
@@ -109,9 +122,12 @@
     "eslint-plugin-react": "^7.20.0",
     "eslint-plugin-react-hooks": "^2.5.1",
     "mocha": "^8.3.2",
+    "nodemon": "^2.0.7",
     "react-app-rewired": "^2.1.8",
     "react-test-renderer": "^16.12.0",
     "spectron": "^5.0.0",
-    "test-data-bot": "^0.8.0"
-  }
-}
+    "test-data-bot": "^0.8.0",
+    "vue-jest": "^3.0.7"
+  },
+  "proxy": "http://spearmint.us-west-1.elasticbeanstalk.com"
+}