diff --git a/api/package.json b/api/package.json index 528166a0a..5d57b6c4b 100644 --- a/api/package.json +++ b/api/package.json @@ -3,15 +3,16 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "node ./bin/www" + "start": "node ./bin/www" }, "dependencies": { - "cookie-parser": "~1.4.3", - "cors": "^2.8.4", - "debug": "~2.6.9", - "express": "~4.16.0", - "http-errors": "~1.6.2", - "jade": "~1.11.0", - "morgan": "~1.9.0" + "cookie-parser": "^1.4.5", + "cors": "^2.8.5", + "debug": "~2.6.9", + "express": "^4.16.4", + "http-errors": "~1.6.2", + "morgan": "^1.10.0", + "pug": "^3.0.0" } -} + } + \ No newline at end of file diff --git a/client/Knock-knock Joke b/client/Knock-knock Joke new file mode 100644 index 000000000..e63c049e3 --- /dev/null +++ b/client/Knock-knock Joke @@ -0,0 +1,5 @@ +Knock-knock +Who's there? +Joe? +Joe who? +Joe mama diff --git a/client/package.json b/client/package.json index 0590c877b..a3d6163e0 100644 --- a/client/package.json +++ b/client/package.json @@ -3,14 +3,26 @@ "version": "0.1.0", "private": true, "dependencies": { - "react": "^16.4.2", - "react-dom": "^16.4.2", - "react-scripts": "1.1.5" + "react": "^16.13.1", + "react-dom": "^16.13.1", + "react-scripts": "^3.4.3" }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test --env=jsdom", - "eject": "react-scripts eject" + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test --env=jsdom", + "eject": "react-scripts eject" + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] } -} \ No newline at end of file + } \ No newline at end of file diff --git a/client/src/App.js b/client/src/App.js index bf0485f71..19655b784 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -24,7 +24,7 @@ class App extends Component {
logo -

Welcome to React

+

Welcome to CISE

{this.state.apiResponse}