diff --git a/js/components/Image/component.js b/js/components/Image/component.js new file mode 100644 index 0000000..378f75a --- /dev/null +++ b/js/components/Image/component.js @@ -0,0 +1,11 @@ +import React, { Component } from 'react' + +export default class Image extends Component { + render() { + return ( +
+ +
+ ) + } +} diff --git a/js/components/Image/index.js b/js/components/Image/index.js new file mode 100644 index 0000000..ce4ea33 --- /dev/null +++ b/js/components/Image/index.js @@ -0,0 +1,3 @@ +import component from './component' + +export default component diff --git a/js/components/Image/styles.css b/js/components/Image/styles.css new file mode 100644 index 0000000..e69de29 diff --git a/js/pages/Main/assets/big_cat.jpeg b/js/pages/Main/assets/big_cat.jpeg new file mode 100644 index 0000000..d23e5ab Binary files /dev/null and b/js/pages/Main/assets/big_cat.jpeg differ diff --git a/js/pages/Main/component.js b/js/pages/Main/component.js index 2b88059..16a711d 100644 --- a/js/pages/Main/component.js +++ b/js/pages/Main/component.js @@ -1,5 +1,8 @@ import React from 'react' import Links from '../../components/Links' +import Image from '../../components/Image' +import bigCat from './assets/big_cat.jpeg' +import styles from './styles.css' class Main extends React.Component { render() { @@ -7,6 +10,7 @@ class Main extends React.Component {
{this.props.children} +
) } diff --git a/js/pages/Main/styles.css b/js/pages/Main/styles.css index f5bd542..8ac683a 100644 --- a/js/pages/Main/styles.css +++ b/js/pages/Main/styles.css @@ -1,3 +1,8 @@ .body { background: blue; } + +.imageSize img { + max-height: 200px; + max-width: 200px; +} diff --git a/package.json b/package.json index 2c744af..b4a093e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,9 @@ "devDependencies": { "autoprefixer": "^6.5.0", "babel-loader": "^6.2.5", + "babel-preset-es2015": "^6.16.0", "css-loader": "^0.25.0", + "file-loader": "^0.9.0", "html-webpack-plugin": "^2.22.0", "jsx-loader": "^0.13.2", "postcss-loader": "^0.13.0", diff --git a/webpack.config.js b/webpack.config.js index 1858c20..2ac8f35 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -38,6 +38,10 @@ module.exports = { ), include: __dirname + '/js' }, + { + test: /\.jpeg$/, + loader: 'file-loader' + }, { test: /\.js$/, exclude: /node_modules/,