Refactored

src/index.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { hashHistory } from 'react-router';
-import Routes from './routes';
+import Routes from './routes/routes';
 
 
 import './index.css';
+import './fonts/font.css';
+
 
 ReactDOM.render(
   <Routes history={hashHistory} />,

src/about/index.js → src/lib/components/AboutPage/index.js

@@ -2,15 +2,12 @@
  * Created by terencelimzw on 26/12/16.
  */
 
-import React, {Component } from 'react';
-import Card from '../lib/card'
+import React, {PureComponent } from 'react';
+import Card from '../Card';
 
 import './index.css';
 
-export default class About extends Component {
-  // static propTypes = {}
-  // static defaultProps = {}
-  // state = {}
+export default class About extends PureComponent {
 
   render() {
     // const { className, ...props } = this.props;

src/lib/card/index.js → src/lib/components/Card/index.js

@@ -6,7 +6,6 @@
  */
 import React, {PropTypes} from "react";
 
-import "../../fonts/font.css"
 import "./index.css";
 
 const Card = ({children,title,width}) => (

src/lib/heatmap/index.js → src/lib/components/Heatmap/index.js

@@ -10,7 +10,7 @@ const HeatMap = ({gridSize,stroke,strokeOpacity,colorRange,data,onMouseOver,onMo
   var domain = [0,(raw_data?d3.max(raw_data.map(d=>d3.max(d))):0)]
   var colorScale = d3.scaleLinear().range(colorRange).domain(domain)
   return (
-      <g className={"heatmap"}>
+      <g className={"Heatmap"}>
         {data.map((d, i) => {
             return (
               d.avail.map((a, b) => (

src/lib/nav/index.js → src/lib/components/Navbar/index.js

@@ -5,7 +5,6 @@ import React, {PropTypes} from "react";
 import {Link} from "react-router";
 
 import "./index.css";
-import "../../fonts/font.css"
 
 const Navbar = ({title,links}) => {
 

src/notfound/index.js → src/lib/components/NotFoundPage/index.js

@@ -3,7 +3,7 @@
  */
 
 import React, {Component } from 'react';
-import Card from '../lib/card'
+import Card from '../Card'
 
 import './index.css';
 

src/lib/select/index.js → src/lib/components/Select/index.js

@@ -4,6 +4,7 @@
 import React, {PropTypes} from "react";
 
 import "./index.css";
+
 const Select = ({options,text,onChange,value}) => {
   return (
     <div className="select-container">

src/lib/tooltip/index.js → src/lib/components/Tooltip/index.js

@@ -1,12 +1,6 @@
-/**
- * Created by terencelimzw on 24/12/16.
- */
-/**
- * Created by terencelimzw on 24/12/16.
- */
 import React, {PropTypes} from "react";
 
-import "./index.css";
+import "./index.css"
 
 const Tooltip = ({show,x,y,message}) => {
   const classes = show ? "tooltip show" : "tooltip";

src/main/index.js → src/lib/containers/AppShell/index.js

@@ -1,16 +1,9 @@
-/**
- * Created by terencelimzw on 26/12/16.
- */
-
-import React, {Component } from 'react';
-import Navbar from '../lib/nav';
+import React, {Component} from 'react';
+import Navbar from '../../components/Navbar';
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
 import './index.css';
 
-export default class About extends Component {
-  // static propTypes = {}
-  // static defaultProps = {}
-  // state = {}
+export default class AppShell extends Component {
 
   render() {
     // const { className, ...props } = this.props;

src/app/index.js → src/lib/containers/Module/index.js

@@ -1,17 +1,16 @@
 import React, { Component } from 'react';
-import Card from '../lib/card';
-import HeatMap from '../lib/heatmap'
-import Axis from '../lib/axes'
-import ChartSVG from '../lib/chart'
-import Tooltip from '../lib/tooltip'
-import Select from '../lib/select'
+import Card from '../../components/Card';
+import HeatMap from '../../components/Heatmap';
+import Axis from '../../components/HeatmapAxes';
+import ChartSVG from '../../components/ChartSVG';
+import Tooltip from '../../components/Tooltip';
+import Select from '../../components/Select';
 import {json} from 'd3-request'
 import * as d3 from 'd3'
 
 import './index.css';
-import '../fonts/font.css'
 
-class App extends Component {
+class Module extends Component {
   constructor(props) {
     super(props);
     this.state = {hover:false,x:0,y:0,value:0};
@@ -35,10 +34,10 @@ class App extends Component {
         update_timestamp: update_timestamp
       });
     };
-    json("http://222.164.236.19:9003/latest.json",
-      (error,data)=>{
-        if (error) {
-          console.log(error);
+    // json("http://222.164.236.19:9003/latest.json",
+    //   (error,data)=>{
+    //     if (error) {
+    //       console.log(error);
           json("https://raw.githubusercontent.com/terencelimzhengwei/active-sg-badminton/master/data/latest.json",
             (error,data)=>{
               if (error) {
@@ -47,11 +46,11 @@ class App extends Component {
               setData(data);
             }
           )
-        } else {
-          setData(data);
-        }
-      }
-      );
+      //   } else {
+      //     setData(data);
+      //   }
+      // }
+      // );
   }
 
   render() {
@@ -125,4 +124,4 @@ class App extends Component {
   }
 }
 
-export default App;
+export default Module;

src/routes.js → src/routes/routes.js

@@ -5,10 +5,10 @@
 import React from 'react';
 import { Router, Route } from 'react-router';
 
-import App from './app';
-import About from './about';
-import Main from './main';
-import NotFound from './notfound';
+import App from '../lib/containers/Module'
+import About from '../lib/components/AboutPage';
+import Main from '../lib/containers/AppShell';
+import NotFound from '../lib/components/NotFoundPage';
 
 const Routes = (props) => (
   <Router {...props}>