Skip to content

Merge welcome message branch into the Develop branch #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BroItsBren wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Merge welcome message branch into the Develop branch #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8374b34
Step 10. Pushing Branch
BroItsBren Mar 9, 2021
5535be6
Commit API package.json
BroItsBren Mar 9, 2021
4e65034
Commit Client package.json
BroItsBren Mar 9, 2021
b7cbe50
Merge pull request #1 from BroItsBren:updated_package_files
BroItsBren Mar 10, 2021
0f87de7
Merge pull request #2 from BroItsBren:Change_welcome_message
BroItsBren Mar 10, 2021
b119f2f
Change message to more client friendly
BroItsBren Mar 10, 2021
a8fc1a6
Merge pull request #3 from BroItsBren:Change_welcome_message
BroItsBren Mar 10, 2021
14e6984
Create Knock-knock Joke
SpareBot11 Mar 10, 2021
db6aaf8
Merge pull request #4 from BroItsBren/SpareBot11-patch-1
BroItsBren Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}

5 changes: 5 additions & 0 deletions client/Knock-knock Joke
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Knock-knock
Who's there?
Joe?
Joe who?
Joe mama
28 changes: 20 additions & 8 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
}
2 changes: 1 addition & 1 deletion client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class App extends Component {
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<h1 className="App-title">Welcome to React</h1>
<h1 className="App-title">Welcome to CISE</h1>
</header>
<p className="App-intro">{this.state.apiResponse}</p>
</div>
Expand Down