Refolder components for a better require flow.

react-toolbox · Jun 22, 2015 · 5bcf990 · 5bcf990
1 parent e45b47b
commit 5bcf990
Show file tree

Hide file tree

Showing 28 changed files with 37 additions and 77 deletions.
diff --git a/components/aside/index.cjsx b/components/aside/index.cjsx
@@ -2,7 +2,7 @@
 @todo
 ###
 
-Style    = require './style'
+require './style'
 
 module.exports = React.createClass
 

diff --git a/components/aside/style.styl b/components/aside/style.styl
@@ -1,4 +1,4 @@
-@import "../constants"
+@import "../constants.styl"
 
 [data-component-aside]
   position                        : absolute

diff --git a/components/autocomplete.cjsx → components/autocomplete/index.cjsx b/components/autocomplete.cjsx → components/autocomplete/index.cjsx
@@ -2,8 +2,8 @@
 @todo
 ###
 
-Style = require './style/autocomplete'
-Input = require './input'
+require './style'
+Input = require '../input'
 
 module.exports = React.createClass
 

diff --git a/components/style/autocomplete.styl → components/autocomplete/style.styl b/components/style/autocomplete.styl → components/autocomplete/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-autocomplete]
   position                                      : relative

diff --git a/components/button.cjsx → components/button/index.cjsx b/components/button.cjsx → components/button/index.cjsx
@@ -2,9 +2,9 @@
 @todo
 ###
 
-Style    = require './style/button'
-FontIcon = require "./font_icon"
-Ripple   = require "./ripple"
+require './style'
+FontIcon = require "../font_icon"
+Ripple   = require "../ripple"
 
 module.exports = React.createClass
 

diff --git a/components/style/button.styl → components/button/style.styl b/components/style/button.styl → components/button/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-button]
   z-index                       : 1

diff --git a/components/style/__commons.styl → components/commons.styl b/components/style/__commons.styl → components/commons.styl
diff --git a/components/dialog.cjsx → components/dialog/index.cjsx b/components/dialog.cjsx → components/dialog/index.cjsx
@@ -2,9 +2,9 @@
 @todo
 ###
 
-Style = require './style/dialog'
-Button = require './button'
-Navigation = require './navigation'
+require './style'
+Button      = require '../button'
+Navigation  = require '../navigation'
 
 module.exports = React.createClass
 

diff --git a/components/style/dialog.styl → components/dialog/style.styl b/components/style/dialog.styl → components/dialog/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-dialog]
   z-index                             : 3

diff --git a/components/font_icon.cjsx → components/font_icon/index.cjsx b/components/font_icon.cjsx → components/font_icon/index.cjsx
@@ -3,6 +3,8 @@
 ###
 
 
+# require './style'
+
 module.exports = React.createClass
 
   # -- States & Properties

diff --git a/components/style/font_icon.styl → components/font_icon/style.styl b/components/style/font_icon.styl → components/font_icon/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 @font-face
   font-family             : 'MaterialIcons'

diff --git a/components/form.cjsx → components/form/index.cjsx b/components/form.cjsx → components/form/index.cjsx
@@ -2,10 +2,10 @@
 @todo
 ###
 
-Style         = require './style/form'
-Autocomplete  = require "./autocomplete"
-Button        = require "./button"
-Input         = require "./input"
+require './style'
+Autocomplete  = require "../autocomplete"
+Button        = require "../button"
+Input         = require "../input"
 
 module.exports = React.createClass
 

diff --git a/components/style/form.styl → components/form/style.styl b/components/style/form.styl → components/form/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-form]
   & > :last-child

diff --git a/components/input.cjsx → components/input/index.cjsx b/components/input.cjsx → components/input/index.cjsx
@@ -2,7 +2,7 @@
 @todo
 ###
 
-Style     = require './style/input'
+require './style'
 
 module.exports = React.createClass
 

diff --git a/components/style/input.styl → components/input/style.styl b/components/style/input.styl → components/input/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-input]
   position                            : relative

diff --git a/components/link.cjsx → components/link/index.cjsx b/components/link.cjsx → components/link/index.cjsx
@@ -2,8 +2,8 @@
 @todo
 ###
 
-Style = require './style/link'
-FontIcon = require "./font_icon"
+require './style'
+FontIcon = require "../font_icon"
 
 module.exports = React.createClass
 

diff --git a/components/style/link.styl → components/link/style.styl b/components/style/link.styl → components/link/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-link]
   position                        : relative

diff --git a/components/list.cjsx → components/list/index.cjsx b/components/list.cjsx → components/list/index.cjsx
@@ -2,7 +2,7 @@
 @todo
 ###
 
-Style = require './style/list'
+require './style'
 
 module.exports = React.createClass
 

diff --git a/components/style/list.styl → components/list/style.styl b/components/style/list.styl → components/list/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-list]
   list-style                      : none

diff --git a/components/loading.cjsx → components/loading/index.cjsx b/components/loading.cjsx → components/loading/index.cjsx
@@ -2,7 +2,7 @@
 @todo
 ###
 
-Style = require './style/loading'
+require './style'
 
 module.exports = React.createClass
 

diff --git a/components/style/loading.styl → components/loading/style.styl b/components/style/loading.styl → components/loading/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-loading]
   z-index                           : 2

diff --git a/components/navigation.cjsx → components/navigation/index.cjsx b/components/navigation.cjsx → components/navigation/index.cjsx
@@ -2,10 +2,10 @@
 @todo
 ###
 
-Style = require './style/navigation'
+require './style'
 # -- Components
-Button          = require './button'
-Link            = require './link'
+Button  = require '../button'
+Link    = require '../link'
 
 module.exports = React.createClass
 

diff --git a/components/style/navigation.styl → components/navigation/style.styl b/components/style/navigation.styl → components/navigation/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-navigation="horizontal"]
   > *

diff --git a/components/ripple.cjsx → components/ripple/index.cjsx b/components/ripple.cjsx → components/ripple/index.cjsx
@@ -2,7 +2,7 @@
 @todo
 ###
 
-Style = require './style/ripple'
+require './style'
 
 module.exports = React.createClass
 

diff --git a/components/style/ripple.styl → components/ripple/style.styl b/components/style/ripple.styl → components/ripple/style.styl
@@ -1,4 +1,4 @@
-@import "__constants.styl"
+@import "../constants.styl"
 
 [data-component-ripple]
   position                    : absolute

diff --git a/components/router.coffee → components/router/router.coffee b/components/router.coffee → components/router/router.coffee
diff --git a/components/style/__constants.styl b/components/style/__constants.styl
diff --git a/webpack.config.coffee b/webpack.config.coffee
@@ -11,7 +11,7 @@ module.exports =
   context       : __dirname
 
   entry:
-    commons     : ['./components/style/__commons.styl']
+    commons     : ['./components/commons.styl']
     test        : ['webpack/hot/dev-server', './spec/index.cjsx']
     # test        : ['webpack/hot/dev-server', './spec/index.cjsx']