refactor(application structure): flattened the whole structure

.tern-project

@@ -3,6 +3,9 @@
   "libs": [
     "browser"
   ],
+  "loadEagerly": [
+    "./app"
+  ],
   "plugins": {
     "complete_strings": {},
     "modules": {},
@@ -11,4 +14,4 @@
       "fullDocs": true
     }
   }
-}
+}

app/js/components/Main/index.js

@@ -1,7 +1,9 @@
 'use strict'
 
 import m from 'mithril'
-import ToolbarContainer from '../../containers/Root/Main/Toolbar'
+
+// TODO remove this toolbar from the presentational component and pass it down from  container
+import ToolbarContainer from '../../containers/Toolbar'
 import styles from './style.scss'
 
 const Main = {

app/js/components/Table/index.js

@@ -16,15 +16,15 @@ const Table = {
           },
           m(`ul.${styles.contentColumn}`, [
             m(`li.${styles.header}`, m('p', column)),
-              vdom.attrs.issues.map((issue, i) => {
-                return m(`li.${styles.row}`,
-                  {
-                    class: (i % 2 !== 0) ? `${styles.dimmed}` : '',
-                  },
-                  m('p', issue[index]))
-                // issue.map((field) => m('li', m('p', field)))
-              }),
-            ]))
+            vdom.attrs.issues.map((issue, i) => {
+              return m(`li.${styles.row}`,
+                {
+                  class: (i % 2 !== 0) ? `${styles.dimmed}` : '',
+                },
+                m('p', issue[index]))
+              // issue.map((field) => m('li', m('p', field)))
+            }),
+          ]))
         }),
       ])
     },

app/js/containers/Root/Main/Data/index.js → app/js/containers/Data.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import m from 'mithril'
-import DataComponent from '../../../../components/Data'
+import DataComponent from '../components/Data'
 
 import TableContainer from './Table'
 // import PaginationContainer from './Pagination'

app/js/containers/Root/Main/Geospacial/index.js → app/js/containers/Geo.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import m from 'mithril'
-import GeospacialComponent from '../../../../components/Geospacial'
+import GeospacialComponent from '../components/Geospacial'
 
 const Geospacial = {
   view() {

app/js/containers/Root/Main/Graph/index.js → app/js/containers/Graph.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import m from 'mithril'
-import GraphComponent from '../../../../components/Graph'
+import GraphComponent from '../components/Graph'
 
 const Graph = {
   view() {

app/js/containers/Root/Main/index.js → app/js/containers/Main.js

@@ -6,8 +6,8 @@ import m from 'mithril'
 // import {getEntityById, isPending} from '../selectors';
 // import {fetchRepo, showMessage} from '../actions';
 // import styles from './style.scss'
-import MainComponent from '../../../components/Main'
-import { retrieveContainer } from '../../../helpers'
+import MainComponent from '../components/Main'
+import { retrieveContainer } from '../helpers'
 
 const Main = {
   view(vdom) {

app/js/containers/Navbar/index.js → app/js/containers/Navbar.js

@@ -2,11 +2,11 @@
 'use strict'
 
 import m from 'mithril'
-import NavbarComponent from '../../components/Navbar'
+import NavbarComponent from '../components/Navbar'
 
-import mapIcon from '../../../svg/map-icon'
-import graphIcon from '../../../svg/graph-icon'
-import dataIcon from '../../../svg/data-icon'
+import mapIcon from '../../svg/map-icon'
+import graphIcon from '../../svg/graph-icon'
+import dataIcon from '../../svg/data-icon'
 
 const icons = [mapIcon, graphIcon, dataIcon]
 

app/js/containers/Root/index.js → app/js/containers/Root.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { configureStore } from '../../store'
+import { configureStore } from '../store'
 // this configure store function takes in initial state
 // we can store this persistent state in indexdb and reload it on next app
 // initialtion
@@ -12,16 +12,16 @@ import { configureStore } from '../../store'
 const store = configureStore()
 
 // import 'normalize-css'
-import '../global-style.scss'
-import '../../../fonts/Roboto-Regular.ttf'
+import './global-style.scss'
+import '../../fonts/Roboto-Regular.ttf'
 
 import m from 'mithril'
 
 import Toolbar from './Toolbar'
 import Navbar from './Navbar'
 import Main from './Main'
 
-import styles from '../../components/styles.scss'
+import styles from '../components/styles.scss'
 
 const Root = {
   view(vnode) {

app/js/containers/Root/Main/Data/Table/index.js → app/js/containers/Table.js

@@ -2,9 +2,9 @@
 
 import m from 'mithril'
 
-import TableComponent from '../../../../../../../app/js/components/Table'
+import TableComponent from '../components/Table'
 
-import { mockedHeaderColumnNames, mockedIssue } from '../../../../../../../tests/mocks/data'
+import { mockedHeaderColumnNames, mockedIssue } from '../../../tests/mocks/data'
 
 // import { mockedIssue } from '../../../../../../../../tests/mocks/data'
 

app/js/containers/Root/Main/Toolbar/index.js → app/js/containers/Toolbar-inner.js

@@ -4,12 +4,12 @@
 
 import m from 'mithril'
 // import classNames from 'classnames'
-import ToolbarComponent from '../../../../components/Toolbar'
-import { resolveHeading } from '../../../../helpers'
+import ToolbarComponent from '../components/Toolbar'
+import { resolveHeading } from '../helpers'
 // import {getMessages} from '../selectors'
 // import {clearMessage} from '../actions'
 // import styles from './style.scss'
-import styles from '../../../../components/Toolbar/styles.scss'
+import styles from '../components/Toolbar/styles.scss'
 
 
 const Toolbar = {

app/js/containers/Root/Toolbar/index.js → app/js/containers/Toolbar.js

@@ -4,12 +4,12 @@
 
 import m from 'mithril'
 // import classNames from 'classnames'
-import ToolbarComponent from '../../../components/Toolbar'
-import { resolveHeading } from '../../../helpers'
+import ToolbarComponent from '../components/Toolbar'
+import { resolveHeading } from '../helpers'
 // import {getMessages} from '../selectors'
 // import {clearMessage} from '../actions'
 // import styles from './style.scss'
-import styles from '../../../components/Toolbar/styles.scss'
+import styles from '../components/Toolbar/styles.scss'
 
 const Toolbar = {
   view(vnode) {

app/js/containers/Root/Navbar/index.js → app/js/containers/oldNavbar.js

@@ -2,11 +2,11 @@
 'use strict'
 
 import m from 'mithril'
-import NavbarComponent from '../../../components/Navbar'
+import NavbarComponent from '../components/Navbar'
 
-import mapIcon from '../../../../svg/map-icon'
-import graphIcon from '../../../../svg/graph-icon'
-import dataIcon from '../../../../svg/data-icon'
+import mapIcon from '../../svg/map-icon'
+import graphIcon from '../../svg/graph-icon'
+import dataIcon from '../../svg/data-icon'
 
 const icons = [mapIcon, graphIcon, dataIcon]
 

app/js/helpers/main.js

@@ -1,6 +1,6 @@
-import GraphContainer from '../containers/Root/Main/Graph'
-import DataContainer from '../containers/Root/Main/Data'
-import GeoContainer from '../containers/Root/Main/Geospacial'
+import GraphContainer from '../containers/Graph'
+import DataContainer from '../containers/Data'
+import GeoContainer from '../containers/Geo'
 
 export function retrieveContainer(route) {
   switch (route) {

tests/app/js/components/main.spec.js

@@ -8,9 +8,9 @@ import mq from 'mithril-query'
 
 import Main from '../../../../app/js/components/Main'
 
-import GeospacialContainer from '../../../../app/js/containers/Root/Main/Geospacial'
-import Data from '../../../../app/js/containers/Root/Main/Data'
-import Graph from '../../../../app/js/containers/Root/Main/Graph'
+import GeospacialContainer from '../../../../app/js/containers/Geo'
+import Data from '../../../../app/js/containers/Data'
+import Graph from '../../../../app/js/containers/Graph'
 
 describe('main component', () => {
   it('should display geospacial view', () => {