1
0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 18:32:50 +00:00

beautified

This commit is contained in:
2016-09-01 13:11:17 +00:00
parent f8ccec7ae0
commit f8c89b4486
16 changed files with 107 additions and 104 deletions

View File

@@ -2,10 +2,10 @@ import React from 'react';
import '../../assets/scss/Footer.scss';
export default class Footer extends React.Component{
export default class Footer extends React.Component {
render(){
return(
render() {
return (
<div class="Footer">
Site created and maintained by Mitchell Gerber
</div>

View File

@@ -1,13 +1,13 @@
import React from 'react';
import {bubble} from '../../assets/js/bubble';
export default class Header extends React.Component{
componentDidMount(){
export default class Header extends React.Component {
componentDidMount() {
bubble();
}
render(){
return(
render() {
return (
<header id="header" class="Header">
<canvas id="canvas" width="854" height="709"></canvas>
</header>

View File

@@ -1,23 +1,23 @@
import hljs from 'highlight.js';
import marked from 'marked';
import React from 'react';
import {Link} from 'react-router';
import marked from 'marked';
import hljs from 'highlight.js';
import '../../assets/scss/Content.scss';
const renderer = new marked.Renderer();
marked.setOptions({
langPrefix: 'hljs ',
highlight: (code) => {
return hljs.highlightAuto(code).value;
}
langPrefix: 'hljs ',
highlight: (code) => {
return hljs.highlightAuto(code).value;
}
});
export default class Post extends React.Component{
export default class Post extends React.Component {
render(){
return(
render() {
return (
<div class="Content">
<div dangerouslySetInnerHTML={{__html : marked(this.props.content, {renderer : renderer})}}>
</div>

View File

@@ -3,11 +3,11 @@ import {Link} from 'react-router';
import '../../assets/scss/Content.scss';
export default class Preview extends React.Component{
export default class Preview extends React.Component {
insertPosts(posts){
insertPosts(posts) {
let elements = [];
for (let i = 0; i < this.props.postLimit && i < posts.length; i++){
for (let i = 0; i < this.props.postLimit && i < posts.length; i++) {
elements.push(
<div class="post" key={i}>
<div class="date">
@@ -27,9 +27,9 @@ export default class Preview extends React.Component{
return elements;
}
render(){
render() {
const posts = this.props.posts;
return (
<div class="Content">
{posts.length > 0 ? this.insertPosts(posts): null}

View File

@@ -7,9 +7,9 @@ import SensorList from './sensors/SensorList';
import me from '../../assets/images/me.jpg';
import '../../assets/scss/Sidebar.scss';
export default class Sidebar extends React.Component{
export default class Sidebar extends React.Component {
constructor(){
constructor() {
super();
this.state = {
@@ -19,7 +19,7 @@ export default class Sidebar extends React.Component{
this.onToggle = this.onToggle.bind(this);
}
onToggle(){
onToggle() {
let temp = this.state.toggler;
temp = temp === "open" ? "" : "open";
@@ -28,8 +28,8 @@ export default class Sidebar extends React.Component{
});
}
render(){
return(
render() {
return (
<div class={"Sidebar " + this.state.toggler}>
<a onClick={this.onToggle} class="toggler">
<i

View File

@@ -3,21 +3,21 @@ import 'whatwg-fetch';
export default class SensorList extends React.Component {
constructor(){
constructor() {
super();
this.state = {
sensors : {},
sensors: {},
fetching: false,
fetched: false
}
}
componentDidMount(){
componentDidMount() {
this.loadSensorData();
}
loadSensorData(){
loadSensorData() {
this.setState({
fetching: true
});
@@ -49,7 +49,7 @@ export default class SensorList extends React.Component {
</div>
);
}
render(){
render() {
return (
<div>
{this.state.fetched ? this.state.sensors.map(this.insertSensorData) : null}