Skip to content

Commit 09ec25b

Browse files
ericgparkericgpark
authored
Merge pull request #110 from oslabs-beta/master
Spearmint Release v0.7.0
2 parents c463d04 + 5fe0099 commit 09ec25b

File tree

96 files changed

+4056
-1117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+4056
-1117
lines changed

‎.dockerignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
node_modules
2+
Dockerfile
3+
.git
4+
.gitignore
5+
.dockerignore
6+
.env
7+
package-lock.json

‎.eslintignore‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
node_modules
1+
node_modules
2+
3+
*.js
4+
5+
*.tsx
6+
7+
*.jsx

‎.gitignore‎

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
1-
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2-
3-
# dependencies
4-
/node_modules
5-
/.pnp
6-
.pnp.js
7-
8-
# testing
9-
/coverage
10-
11-
# production
12-
/build
13-
/dist
14-
15-
# misc
16-
.DS_Store
17-
.env.local
18-
.env.development.local
19-
.env.test.local
20-
.env.production.local
21-
.env
22-
23-
/package-lock.json
24-
npm-debug.log*
25-
yarn-debug.log*
26-
yarn-error.log*
27-
28-
29-
#configuration
30-
.vscode
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
7+
8+
# testing
9+
/coverage
10+
11+
# production
12+
/build
13+
/dist
14+
15+
# misc
16+
.DS_Store
17+
.env.local
18+
.env.development.local
19+
.env.test.local
20+
.env.production.local
21+
.env
22+
23+
/package-lock.json
24+
npm-debug.log*
25+
yarn-debug.log*
26+
yarn-error.log*
27+
28+
29+
#configuration
30+
.vscode
31+
32+
33+
/server/node_modules
34+
/server/spearmint.zip

‎Dockerfile‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM node:14
2+
RUN apt-get update && apt-get install \
3+
git libx11-xcb1 libxcb-dri3-0 libxtst6 libnss3 libatk-bridge2.0-0 libgtk-3-0 libxss1 libasound2 \
4+
-yq --no-install-suggests --no-install-recommends \
5+
&& apt-get clean && rm -rf /var/lib/apt/lists/*
6+
RUN useradd -d /spearmint spearmint
7+
USER spearmint
8+
WORKDIR /spearmint
9+
COPY package.json .
10+
RUN npm run install-once
11+
COPY . .
12+
EXPOSE 3000
13+
USER root
14+
RUN chown root /spearmint/node_modules/electron/dist/chrome-sandbox
15+
RUN chmod 4755 /spearmint/node_modules/electron/dist/chrome-sandbox
16+
USER spearmint
17+
CMD ["npm", "start"]

‎README.md‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ In an Administrator PowerShell run the following commands: <br />
3838
# How it works
3939

4040

41-
1. On the initial screen, load your application to start creating tests.
41+
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.
4242

4343
![](/public/mainPage.png)
4444

45-
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.
45+
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.
4646

4747
![](/public/generateTest.png)
4848

@@ -55,6 +55,16 @@ In an Administrator PowerShell run the following commands: <br />
5555
5. Accessibility lens have been added in the app to give developers with different mismatches various options to interact with the app.
5656
![](/public/AccLens_Demo.gif)
5757

58+
# New features with version 0.7.0
59+
60+
-Sign-up and Login
61+
62+
-OAuth Login available through GitHub
63+
64+
-Save test states
65+
66+
-**NEW** Accessibility lenses for Low-vision and light sensitivity
67+
5868
<br>
5969

6070

@@ -76,6 +86,7 @@ In an Administrator PowerShell run the following commands: <br />
7686
> Cornelius [@corneeltron](https://github.com/corneeltron) &nbsp;&middot;&nbsp;
7787
> Dave [@davefranz](https://github.com/davefranz) &nbsp;&middot;&nbsp;
7888
> Dieu [@dieunity](https://github.com/dieunity) &nbsp;&middot;&nbsp;
89+
> Eric [@ericgpark](https://github.com/ericgpark) &nbsp;&middot;&nbsp;
7990
> Evan [@Berghoer](https://github.com/Berghoer) &nbsp;&middot;&nbsp; <br />
8091
> Gabriel [@bielchristo](https://github.com/bielchristo)
8192
> Johnny [@johnny-lim](https://github.com/johnny-lim) &nbsp;&middot;&nbsp;
@@ -84,15 +95,18 @@ In an Administrator PowerShell run the following commands: <br />
8495
> Karen [@karenpinilla](https://github.com/karenpinilla) &nbsp;&middot;&nbsp; <br />
8596
> Linda [@lcwish](https://github.com/lcwish) &nbsp;&middot;&nbsp;
8697
> Luis [@Luis-KM-Lo](https://github.com/Luis-KM-Lo) &nbsp;&middot;&nbsp;
87-
> Max [@MaxWeisen](https://github.com/MaxWeisen) &nbsp;&middot;&nbsp;
98+
> Max B[@mbromet](https://github.com/mbromet) &nbsp;&middot;&nbsp;
99+
> Max W [@MaxWeisen](https://github.com/MaxWeisen) &nbsp;&middot;&nbsp;
88100
> Mike [@mbcoker](https://github.com/mbcoker) &nbsp;&middot;&nbsp;
89101
> Mo [@mhmaidi789](https://github.com/mhmaidi789) &nbsp;&middot;&nbsp; <br />
90102
> Natlyn [@natlynp](https://github.com/natlynp) &nbsp;&middot;&nbsp;
91103
> Nick [@nicolaspita](https://github.com/nicolaspita) &nbsp;&middot;&nbsp;
92104
> Rachel [@rachethecreator](https://github.com/rachethecreator) &nbsp;&middot;&nbsp;
93-
> Sean [@sean-haverstock](https://github.com/Sean-Haverstock) &nbsp;&middot;&nbsp; <br />
105+
> Sean Y [@seanyyoo](https://github.com/seanyyoo)&nbsp;&middot;&nbsp;
106+
> Sean H [@sean-haverstock](https://github.com/Sean-Haverstock) &nbsp;&middot;&nbsp; <br />
94107
> Sharon [@sharon-zhu](https://github.com/sharon-zhu) &nbsp;&middot;&nbsp;
95108
> Sieun [@sieunjang](https://github.com/sieunjang) &nbsp;&middot;&nbsp;
96109
> Tolan [@taoantaoan](https://github.com/taoantaoan) &nbsp;&middot;&nbsp;
97-
> Tristen [@twastell](https://github.com/twastell)
110+
> Tristen [@twastell](https://github.com/twastell) &nbsp;&middot;&nbsp;
111+
> Tyler [@tytyjameson](https://github.com/tytyjameson)
98112
<hr>

‎docker-compose.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: '3'
2+
services:
3+
frontend:
4+
container_name: frontend
5+
image: frontend
6+
security_opt:
7+
- seccomp=profile.json
8+
environment:
9+
- DISPLAY=host.docker.internal:0
10+
stdin_open: true
11+
ports:
12+
- "3000:3000"
13+
networks:
14+
- spearmint
15+
backend:
16+
container_name: backend
17+
image: backend
18+
ports:
19+
- "3001:3001"
20+
networks:
21+
- spearmint
22+
networks:
23+
spearmint:
24+
driver: bridge

‎package.json‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "spearmint",
3-
"version": "0.6.0",
3+
"version": "0.7.0",
44
"description": "An open-source developer tool that simplifies testing and hopes to help increase awareness about web accessibility.",
55
"author": "team spearmint",
66
"build": {
@@ -28,26 +28,38 @@
2828
"homepage": "./",
2929
"private": true,
3030
"dependencies": {
31-
"@material-ui/core": "^4.11.3",
31+
"@capacitor/cli": "^3.0.1",
32+
"@capacitor/core": "^3.0.1",
33+
"@capacitor/screen-reader": "^1.0.1",
34+
"@material-ui/core": "^4.11.4",
3235
"@material-ui/icons": "^4.11.2",
3336
"@types/jest": "^25.2.3",
3437
"@types/react-beautiful-dnd": "^12.1.2",
3538
"@types/react-dom": "^16.9.8",
3639
"@types/react-modal": "^3.10.5",
40+
"bcrypt": "^5.0.1",
3741
"classnames": "^2.2.6",
3842
"concurrently": "^4.1.2",
43+
"cookie-parser": "^1.4.5",
3944
"cross-env": "^5.2.1",
40-
"dotenv": "^8.2.0",
45+
"dotenv": "^8.6.0",
46+
"electron-deeplink": "^1.0.6",
4147
"electron-is-dev": "^1.1.0",
48+
"express": "^4.17.1",
4249
"fibers": "^5.0.0",
4350
"fix-path": "^3.0.0",
51+
"install": "^0.13.0",
4452
"js-beautify": "^1.10.0",
4553
"monaco-editor": "^0.17.0",
54+
"mongoose": "^5.12.14",
55+
"node-fetch": "^2.6.1",
4656
"node-pty": "^0.10.0",
4757
"react": "^16.8.6",
4858
"react-autosuggest": "^9.4.3",
4959
"react-beautiful-dnd": "^11.0.3",
5060
"react-dom": "^16.8.6",
61+
"react-google-login": "^5.2.2",
62+
"react-login-github": "^1.0.7",
5163
"react-modal": "^3.8.1",
5264
"react-monaco-editor": "^0.25.1",
5365
"react-scripts": "^3.4.1",
@@ -72,8 +84,8 @@
7284
"electron-rebuild": "electron-rebuild -f -w node-pty",
7385
"postinstall": "electron-builder install-app-deps",
7486
"release": "npm run react-build && electron-builder --publish=always",
75-
"start-windows": "cross-env NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\"",
76-
"start": "NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\""
87+
"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\"",
88+
"start": "NODE_ENV=development concurrently \"cross-env BROWSER=none react-app-rewired start\" \"wait-on http://localhost:3000 && electron .\" \"nodemon server/server.js\""
7789
},
7890
"browserslist": {
7991
"production": [
@@ -95,6 +107,7 @@
95107
"@types/jest": "^25.2.3",
96108
"@typescript-eslint/eslint-plugin": "^2.33.0",
97109
"@typescript-eslint/parser": "^2.33.0",
110+
"@vue/test-utils": "^1.2.1",
98111
"chai": "^4.3.4",
99112
"chai-as-promised": "^7.1.1",
100113
"electron": "^12.0.5",
@@ -109,9 +122,12 @@
109122
"eslint-plugin-react": "^7.20.0",
110123
"eslint-plugin-react-hooks": "^2.5.1",
111124
"mocha": "^8.3.2",
125+
"nodemon": "^2.0.7",
112126
"react-app-rewired": "^2.1.8",
113127
"react-test-renderer": "^16.12.0",
114128
"spectron": "^5.0.0",
115-
"test-data-bot": "^0.8.0"
116-
}
117-
}
129+
"test-data-bot": "^0.8.0",
130+
"vue-jest": "^3.0.7"
131+
},
132+
"proxy": "http://spearmint.us-west-1.elasticbeanstalk.com"
133+
}

0 commit comments

Comments
 (0)