Skip to content

Commit

Permalink
Merge 849c37f into 2241f62
Browse files Browse the repository at this point in the history
  • Loading branch information
XROLE committed Feb 6, 2019
2 parents 2241f62 + 849c37f commit e04fd4e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
},
"homepage": "https://github.com/andela/pippin-ah-frontend#readme",
"dependencies": {
"express": "^4.16.4",
"babel-eslint": "^10.0.1",
"css-loader": "^2.1.0",
"express": "^4.16.4",
"node-sass": "^4.11.0",
"react": "^16.7.0",
"react-dom": "^16.7.0",
Expand Down Expand Up @@ -61,6 +61,7 @@
"pretty-quick": "^1.10.0",
"stylelint-webpack-plugin": "^0.10.5",
"webpack-dev-server": "^3.1.14"

},
"husky": {
"hooks": {
Expand Down
11 changes: 11 additions & 0 deletions src/components/About.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React from "react";

const AboutPage = () => {
return (
<div>
<h1> ABOUT PAGE </h1>
</div>
);
}

export default AboutPage;
10 changes: 7 additions & 3 deletions webpack/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ plugins:[
{
template: './public/index.html'
}

),
new StyleLintPlugin({
configFile: '.stylelintrc',
Expand All @@ -41,7 +42,10 @@ plugins:[
quiet: false
})
],
resolve: {
extensions: ['.js', '.jsx'],
}
resolve: {
extensions: ['.js', '.jsx'],
},
devServer: {
historyApiFallback: true,
}
}

0 comments on commit e04fd4e

Please sign in to comment.