diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21eba63bb9713e85d53c68fde0229b7190f1adc1..9c068c5cddac3e39d0cd2e2dfd829905daae6420 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,9 @@ before_script: pages: stage: deploy - script: hexo deploy + script: + - hexo server + - hexo deploy artifacts: paths: - public diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/public/index.html b/public/index.html index f63bf903835f5acf9199575cb4c93ac4da8888c6..e08b1736ab8d5833b5c2f4f229c1a9ac07679d4b 100644 --- a/public/index.html +++ b/public/index.html @@ -3,10 +3,11 @@ <head> <meta charset="UTF-8"/> <title>React example with static pages</title> + <link rel="stylesheet" href="style.css"/> <link rel="stylesheet" href="bootstrap.min.css"/> </head> <body> - <div style=" margin-top: 30px;"/> + <div style=" margin-top: 3%;"/> <div id="root"></div> </body> </html> diff --git a/public/style.css b/public/style.css new file mode 100644 index 0000000000000000000000000000000000000000..13e1bd0ab7bcc4b12c46340077c6aeb81d4d3a83 --- /dev/null +++ b/public/style.css @@ -0,0 +1,5 @@ +.cc-size { + min-width: 400px; + max-width: 49%; + float: left; +} diff --git a/src/ZhRaD3r.mp4 b/src/ZhRaD3r.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..016e430c0e29a9b306d96c558f0ea2e660bf27a1 Binary files /dev/null and b/src/ZhRaD3r.mp4 differ diff --git a/src/index.js b/src/index.js index 0dca89625c1016cad8d6f9a1f9ca3c6dd158b7df..7447ba8455e619852fd7e50408749ce5cc7c11c0 100644 --- a/src/index.js +++ b/src/index.js @@ -31,7 +31,25 @@ class Case { } } let cases = [ - new Case('Title 1', 'Hei', 'http://allhdwallpapers.com/wp-content/uploads/2015/07/Storm-3.jpg'), + new Case('Title1', 'hå', 'https://i.imgur.com/vSD5rT8.gif'), + new Case('Title 2', 'Hå', 'http://s1.bwallpapers.com/wallpapers/2014/01/29/snow-cat_045842554.jpg'), + new Case( + 'Title 2', + 'Hå', + 'https://proxy.duckduckgo.com/iu/?u=http%3A%2F%2Fwww.gordonrigg.com%2Fthe-hub%2Fwp-content%2Fuploads%2F2015%2F06%2Fcats.jpg&f=1' + ), + new Case('Title 2', 'Hå', 'http://hdgifs.com/wp-content/uploads/2017/04/pikaaaaa-chuuuuuuuu.gif'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), + new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg'), new Case('Title 2', 'Hå', 'http://apod.nasa.gov/apod/image/1704/ManDogSun_Hackmann_1600.jpg') ]; @@ -53,18 +71,16 @@ class Menu extends Component { class Home extends Component { render() { return ( - <Card title=" "> - <ListGroup> - {cases.map(e => ( - <Card title={e.overskrift}> - <ListGroup.Item> - <img class="card-img-top" src={e.image} alt={e.image} /> - </ListGroup.Item> - <ListGroup.Item to={'/case/' + e.id}>Comments</ListGroup.Item> - </Card> - ))} - </ListGroup> - </Card> + <div> + {cases.map(e => ( + <Card className="cc-size" title={e.overskrift}> + <ListGroup.Item> + <img className="card-img-top" src={e.image} src={e.image} alt={e.image} /> + </ListGroup.Item> + <ListGroup.Item to={'/case/' + e.id}>Comments</ListGroup.Item> + </Card> + ))} + </div> ); } } @@ -77,10 +93,10 @@ class CaseDetails extends Component<{ match: { params: { id: number } } }> { return null; // Return empty object (nothing to render) } return ( - <div> + <ListGroup> <Card title={e.overskrift}> <ListGroup.Item> - <img src={e.image} alt="Image Cap" /> + <img className="card-img-top" src={e.image} alt="Image Cap" /> </ListGroup.Item> <ListGroup.Item>{e.content}</ListGroup.Item> </Card> @@ -94,7 +110,7 @@ class CaseDetails extends Component<{ match: { params: { id: number } } }> { </ListGroup.Item> </ListGroup> </Card> - </div> + </ListGroup> ); } diff --git a/src/widgets.js b/src/widgets.js index 3b8c3ef87bc7480716e8635455a4ec7445f9e11f..0dc17137bea001c9a81ade44503b66b1175f2ca1 100644 --- a/src/widgets.js +++ b/src/widgets.js @@ -59,7 +59,7 @@ export class Alert extends Component { export class Card extends Component<{ title: React.Node, children?: React.Node }> { render() { return ( - <div className="card"> + <div className="card cc-size"> <div className="card-body"> <h5 className="card-title">{this.props.title}</h5> <div className="card-text">{this.props.children}</div>