Moved theater to only be within an article
This commit is contained in:
parent
9a6c419daa
commit
f05f3a91bf
|
|
@ -1,4 +1,5 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import Theater from './subcomponents/Theater';
|
||||||
import './css/Articles.css';
|
import './css/Articles.css';
|
||||||
|
|
||||||
const Article = ({article}) => {
|
const Article = ({article}) => {
|
||||||
|
|
@ -54,8 +55,11 @@ const Article = ({article}) => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="article">
|
<div className="article">
|
||||||
<div className="title">{article.title}</div>
|
<Theater
|
||||||
<div className="description">{article.desc}</div>
|
title={article.title}
|
||||||
|
description={article.desc}
|
||||||
|
extraClasses="h-50v"
|
||||||
|
/>
|
||||||
<div className="content">{articleFormatter(article.contents)}</div>
|
<div className="content">{articleFormatter(article.contents)}</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import './css/Articles.css';
|
import './css/Articles.css';
|
||||||
import Theater from './subcomponents/Theater';
|
|
||||||
import Article from './Article';
|
import Article from './Article';
|
||||||
import Listing from './subcomponents/Listing';
|
import Listing from './subcomponents/Listing';
|
||||||
import { getArticles } from '../actions';
|
import { getArticles } from '../actions';
|
||||||
|
|
@ -52,11 +51,6 @@ class Articles extends React.Component {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="Articles">
|
<div className="Articles">
|
||||||
<Theater
|
|
||||||
title="Articles"
|
|
||||||
description="Self written articles to help share information I've learned in the past."
|
|
||||||
extraClasses="h-50v"
|
|
||||||
/>
|
|
||||||
<Route path="/articles/:id" render={({match})=>{return this.article(match)}} />
|
<Route path="/articles/:id" render={({match})=>{return this.article(match)}} />
|
||||||
{this.renderArticles()}
|
{this.renderArticles()}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
|
|
||||||
.article .content {
|
.article .content {
|
||||||
width: 80vw;
|
width: 80vw;
|
||||||
|
text-align:left;
|
||||||
}
|
}
|
||||||
|
|
||||||
.article .code {
|
.article .code {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue