move component convention back to what it was

formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs

Makefile

@@ -71,9 +71,11 @@ lint:
 	$(ESLINT) ./src/*.js
 	$(ESLINT) ./src/mixins/*.jsx
 	$(ESLINT) ./src/views/**/*.jsx
+	$(ESLINT) ./src/components/**/*.jsx
 	$(ESLINT) ./src/components/**/**/*.jsx
 	$(SASSLINT) ./src/*.scss
 	$(SASSLINT) ./src/views/**/*.scss
+	$(SASSLINT) ./src/components/**/*.scss
 	$(SASSLINT) ./src/components/**/**/*.scss
 
 unit:

src/components/activity/activity.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .activity {
     ul {

src/components/adminpanel/adminpanel.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 #admin-panel {
     position: fixed;

src/components/box/box.scss

@@ -1,5 +1,5 @@
-@import "../../../colors";
-@import "../../../frameless";
+@import "../../colors";
+@import "../../frameless";
 
 $base-bg: $ui-white;
 

src/components/carousel/carousel.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .carousel {
     $icon-size: 40px;

src/components/dropdown-banner/banner.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 $navigation-height: 50px;
 

src/components/dropdown/dropdown.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .dropdown {
     display: none;

src/components/flex-row/flex-row.scss

@@ -1,4 +1,4 @@
-@import "../../../frameless";
+@import "../../frameless";
 
 .flex-row {
     display: flex;

src/components/footer/conference/footer.jsx

@@ -1,7 +1,7 @@
 var React = require('react');
 
-var FlexRow = require('../../../presentation/flex-row/flex-row.jsx');
-var FooterBox = require('../../../presentation/footer/footer.jsx');
+var FlexRow = require('../../flex-row/flex-row.jsx');
+var FooterBox = require('../container/footer.jsx');
 
 require('./footer.scss');
 

src/components/footer/conference/footer.scss

@@ -1,6 +1,6 @@
-@import "../../../../colors";
-@import "../../../../frameless";
-@import "../../../../typography";
+@import "../../../colors";
+@import "../../../frameless";
+@import "../../../typography";
 
 #footer {
     .inner {

src/components/footer/www/footer.jsx

@@ -1,8 +1,8 @@
 var React = require('react');
 var FormattedMessage = require('react-intl').FormattedMessage;
 
-var FooterBox = require('../../../presentation/footer/footer.jsx');
-var LanguageChooser = require('../../../presentation/languagechooser/languagechooser.jsx');
+var FooterBox = require('../container/footer.jsx');
+var LanguageChooser = require('../../languagechooser/languagechooser.jsx');
 
 require('./footer.scss');
 

src/components/footer/www/footer.scss

@@ -1,4 +1,4 @@
-@import "../../../../colors";
+@import "../../../colors";
 
 #footer {
     .lists {

src/components/forms/button.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 $base-bg: $ui-white;
 $fail-bg: $ui-orange;

src/components/forms/input.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 $base-bg: $ui-white;
 $focus-bg: lighten($ui-blue, 35%);

src/components/forms/select.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .select {
     background-color: $ui-white;

src/components/intro/intro.jsx

@@ -2,10 +2,10 @@ var connect = require('react-redux').connect;
 var omit = require('lodash.omit');
 var React = require('react');
 
-var actions = require('../../../redux/actions.js');
+var actions = require('../../redux/actions.js');
 
-var Modal = require('../../presentation/modal/modal.jsx');
-var Registration = require('../../presentation/registration/registration.jsx');
+var Modal = require('../modal/modal.jsx');
+var Registration = require('../registration/registration.jsx');
 
 require('./intro.scss');
 

src/components/intro/intro.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .intro {
     display: flex;

src/components/languagechooser/languagechooser.jsx

@@ -1,9 +1,9 @@
 var classNames = require('classnames');
 var React = require('react');
 
-var Api = require('../../../mixins/api.jsx');
-var jar  = require('../../../lib/jar.js');
-var languages = require('../../../../languages.json');
+var Api = require('../../mixins/api.jsx');
+var jar  = require('../../lib/jar.js');
+var languages = require('../../../languages.json');
 var Select = require('../forms/select.jsx');
 
 /**

src/components/login/login.jsx

@@ -2,11 +2,11 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var FormattedMessage = require('react-intl').FormattedMessage;
 
-var log = require('../../../lib/log.js');
+var log = require('../../lib/log.js');
 
-var Input = require('../../presentation/forms/input.jsx');
-var Button = require('../../presentation/forms/button.jsx');
-var Spinner = require('../../presentation/spinner/spinner.jsx');
+var Input = require('../forms/input.jsx');
+var Button = require('../forms/button.jsx');
+var Spinner = require('../spinner/spinner.jsx');
 
 require('./login.scss');
 

src/components/login/login.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .login {
     padding: 10px;

src/components/microworld/microworld.jsx

@@ -2,10 +2,10 @@ var React = require('react');
 
 require('./microworld.scss');
 
-var Box = require('../../presentation/box/box.jsx');
-var Carousel = require('../../presentation/carousel/carousel.jsx');
-var Modal = require('../../presentation/modal/modal.jsx');
-var NestedCarousel = require('../../presentation/nestedcarousel/nestedcarousel.jsx');
+var Box = require('../box/box.jsx');
+var Carousel = require('../carousel/carousel.jsx');
+var Modal = require('../modal/modal.jsx');
+var NestedCarousel = require('../nestedcarousel/nestedcarousel.jsx');
 
 var Microworld = React.createClass({
     type: 'Microworld',

src/components/microworld/microworld.scss

@@ -1,5 +1,5 @@
-@import "../../../colors";
-@import "../../../frameless";
+@import "../../colors";
+@import "../../frameless";
 
 $base-bg: $ui-white;
 

src/components/modal/modal.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .ReactModal__Content {
     iframe {

src/components/navigation/conference/navigation.jsx

@@ -1,6 +1,6 @@
 var React = require('react');
 
-var NavigationBox = require('../../../presentation/navigation/navigation.jsx');
+var NavigationBox = require('../container/navigation.jsx');
 
 require('./navigation.scss');
 

src/components/navigation/conference/navigation.scss

@@ -1,5 +1,5 @@
-@import "../../../../colors";
-@import "../../../../frameless";
+@import "../../../colors";
+@import "../../../frameless";
 
 #navigation {
     .inner {

src/components/navigation/www/navigation.jsx

@@ -5,17 +5,17 @@ var ReactIntl = require('react-intl');
 var FormattedMessage = ReactIntl.FormattedMessage;
 var injectIntl = ReactIntl.injectIntl;
 
-var actions = require('../../../../redux/actions.js');
+var actions = require('../../../redux/actions.js');
 
-var Api = require('../../../../mixins/api.jsx');
-var Avatar = require('../../../presentation/avatar/avatar.jsx');
-var Dropdown = require('../../../presentation/dropdown/dropdown.jsx');
-var Input = require('../../../presentation/forms/input.jsx');
-var log = require('../../../../lib/log.js');
+var Api = require('../../../mixins/api.jsx');
+var Avatar = require('../../avatar/avatar.jsx');
+var Dropdown = require('../../dropdown/dropdown.jsx');
+var Input = require('../../forms/input.jsx');
+var log = require('../../../lib/log.js');
 var Login = require('../../login/login.jsx');
-var Modal = require('../../../presentation/modal/modal.jsx');
-var NavigationBox = require('../../../presentation/navigation/navigation.jsx');
-var Registration = require('../../../presentation/registration/registration.jsx');
+var Modal = require('../../modal/modal.jsx');
+var NavigationBox = require('../container/navigation.jsx');
+var Registration = require('../../registration/registration.jsx');
 
 require('./navigation.scss');
 

src/components/navigation/www/navigation.scss

@@ -1,4 +1,4 @@
-@import "../../../../colors";
+@import "../../../colors";
 
 #navigation {
     .logo {

src/components/nestedcarousel/nestedcarousel.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 @import "../carousel/carousel.scss";
 
 .nestedcarousel {

src/components/news/news.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .news {
     ul {

src/components/page/conference/page.scss

@@ -1,5 +1,5 @@
-@import "../../../../colors";
-@import "../../../../main";
+@import "../../../colors";
+@import "../../../main";
 
 #navigation {
     h1 {

src/components/spinner/spinner.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .spinner {
     position: relative;

src/components/subnavigation/subnavigation.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .sub-nav {
     display: flex;

src/components/thumbnail/thumbnail.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .thumbnail {
     .thumbnail-image {

src/components/title-banner/title-banner.scss

@@ -1,5 +1,5 @@
-@import "../../../colors";
-@import "../../../frameless";
+@import "../../colors";
+@import "../../frameless";
 
 .title-banner {
     transition: background-image .5s ease, background-color .5s ease;

src/components/welcome/welcome.scss

@@ -1,4 +1,4 @@
-@import "../../../colors";
+@import "../../colors";
 
 .welcome {
     .box-content {

src/views/about/about.jsx

@@ -3,7 +3,7 @@ var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
 var FormattedMessage = require('react-intl').FormattedMessage;
 var render = require('../../lib/render.jsx');
 
-var Page = require('../../components/container/page/www/page.jsx');
+var Page = require('../../components/page/www/page.jsx');
 
 require('./about.scss');
 

src/views/cards/cards.jsx

@@ -3,9 +3,9 @@ var injectIntl = require('react-intl').injectIntl;
 var FormattedMessage = require('react-intl').FormattedMessage;
 var render = require('../../lib/render.jsx');
 
-var Box = require('../../components/presentation/box/box.jsx');
-var FlexRow = require('../../components/presentation/flex-row/flex-row.jsx');
-var Page = require('../../components/container/page/www/page.jsx');
+var Box = require('../../components/box/box.jsx');
+var FlexRow = require('../../components/flex-row/flex-row.jsx');
+var Page = require('../../components/page/www/page.jsx');
 
 require('./cards.scss');
 

src/views/communityblocks-interviews/communityblocks-interviews.jsx

@@ -1,7 +1,7 @@
 var React = require('react');
 var render = require('../../lib/render.jsx');
 
-var Page = require('../../components/container/page/www/page.jsx');
+var Page = require('../../components/page/www/page.jsx');
 
 var CommunityBlocksInterviews = React.createClass({
     type: 'communityblocks-interviews',

src/views/components/components.jsx

@@ -1,13 +1,13 @@
 var React = require('react');
 var render = require('../../lib/render.jsx');
 
-var Activity = require('../../components/presentation/activity/activity.jsx');
-var Page = require('../../components/container/page/www/page.jsx');
-var Box = require('../../components/presentation/box/box.jsx');
-var Button = require('../../components/presentation/forms/button.jsx');
-var Carousel = require('../../components/presentation/carousel/carousel.jsx');
-var Input = require('../../components/presentation/forms/input.jsx');
-var Spinner = require('../../components/presentation/spinner/spinner.jsx');
+var Activity = require('../../components/activity/activity.jsx');
+var Page = require('../../components/page/www/page.jsx');
+var Box = require('../../components/box/box.jsx');
+var Button = require('../../components/forms/button.jsx');
+var Carousel = require('../../components/carousel/carousel.jsx');
+var Input = require('../../components/forms/input.jsx');
+var Spinner = require('../../components/spinner/spinner.jsx');
 
 require('./components.scss');
 

src/views/conference/expect/expect.jsx

@@ -1,10 +1,10 @@
 var React = require('react');
 var ReactDOM = require('react-dom');
 
-var Button = require('../../../components/presentation/forms/button.jsx');
-var FlexRow = require('../../../components/presentation/flex-row/flex-row.jsx');
-var Page = require('../../../components/container/page/conference/page.jsx');
-var TitleBanner = require('../../../components/presentation/title-banner/title-banner.jsx');
+var Button = require('../../../components/forms/button.jsx');
+var FlexRow = require('../../../components/flex-row/flex-row.jsx');
+var Page = require('../../../components/page/conference/page.jsx');
+var TitleBanner = require('../../../components/title-banner/title-banner.jsx');
 
 require('./expect.scss');
 

src/views/conference/index/index.jsx

@@ -1,10 +1,10 @@
 var React = require('react');
 var ReactDOM = require('react-dom');
 
-var Button = require('../../../components/presentation/forms/button.jsx');
-var FlexRow = require('../../../components/presentation/flex-row/flex-row.jsx');
-var Page = require('../../../components/container/page/conference/page.jsx');
-var TitleBanner = require('../../../components/presentation/title-banner/title-banner.jsx');
+var Button = require('../../../components/forms/button.jsx');
+var FlexRow = require('../../../components/flex-row/flex-row.jsx');
+var Page = require('../../../components/page/conference/page.jsx');
+var TitleBanner = require('../../../components/title-banner/title-banner.jsx');
 
 require('./index.scss');
 

src/views/conference/plan/plan.jsx

@@ -1,10 +1,10 @@
 var React = require('react');
 var ReactDOM = require('react-dom');
 
-var Button = require('../../../components/presentation/forms/button.jsx');
-var FlexRow = require('../../../components/presentation/flex-row/flex-row.jsx');
-var Page = require('../../../components/container/page/conference/page.jsx');
-var TitleBanner = require('../../../components/presentation/title-banner/title-banner.jsx');
+var Button = require('../../../components/forms/button.jsx');
+var FlexRow = require('../../../components/flex-row/flex-row.jsx');
+var Page = require('../../../components/page/conference/page.jsx');
+var TitleBanner = require('../../../components/title-banner/title-banner.jsx');
 
 require('./plan.scss');
 

src/views/credits/credits.jsx

@@ -1,7 +1,7 @@
 var React = require('react');
 var render = require('../../lib/render.jsx');
 
-var Page = require('../../components/container/page/www/page.jsx');
+var Page = require('../../components/page/www/page.jsx');
 
 require('./credits.scss');
 

src/views/hoc/hoc.jsx

@@ -3,12 +3,12 @@ var FormattedMessage = require('react-intl').FormattedMessage;
 var React = require('react');
 var render = require('../../lib/render.jsx');
 
-var Button = require('../../components/presentation/forms/button.jsx');
-var Box = require('../../components/presentation/box/box.jsx');
-var FlexRow = require('../../components/presentation/flex-row/flex-row.jsx');
-var Page = require('../../components/container/page/www/page.jsx');
-var SubNavigation = require('../../components/presentation/subnavigation/subnavigation.jsx');
-var TitleBanner = require('../../components/presentation/title-banner/title-banner.jsx');
+var Button = require('../../components/forms/button.jsx');
+var Box = require('../../components/box/box.jsx');
+var FlexRow = require('../../components/flex-row/flex-row.jsx');
+var Page = require('../../components/page/www/page.jsx');
+var SubNavigation = require('../../components/subnavigation/subnavigation.jsx');
+var TitleBanner = require('../../components/title-banner/title-banner.jsx');
 
 require('./hoc.scss');
 

src/views/jobs/jobs.jsx

@@ -2,7 +2,7 @@ var React = require('react');
 var render = require('../../lib/render.jsx');
 var FormattedMessage = require('react-intl').FormattedMessage;
 
-var Page = require('../../components/container/page/www/page.jsx');
+var Page = require('../../components/page/www/page.jsx');
 
 require('./jobs.scss');
 

src/views/microworld/art/art.jsx

@@ -1,5 +1,5 @@
 var render = require('../../../lib/render.jsx');
-var Microworld = require('../../../components/container/microworld/microworld.jsx');
+var Microworld = require('../../../components/microworld/microworld.jsx');
 
 var microworldData = require('./microworld_art.json');
 

src/views/microworld/fashion/fashion.jsx

@@ -1,5 +1,5 @@
 var render = require('../../../lib/render.jsx');
-var Microworld = require('../../../components/container/microworld/microworld.jsx');
+var Microworld = require('../../../components/microworld/microworld.jsx');
 
 var microworldData = require('./microworld_fashion.json');
 

src/views/microworld/hiphop/hiphop.jsx

@@ -1,5 +1,5 @@
 var render = require('../../../lib/render.jsx');
-var Microworld = require('../../../components/container/microworld/microworld.jsx');
+var Microworld = require('../../../components/microworld/microworld.jsx');
 
 var microworldData = require('./microworld_hiphop.json');
 

src/views/splash/splash.jsx

@@ -8,17 +8,17 @@ var actions = require('../../redux/actions.js');
 
 var Api = require('../../mixins/api.jsx');
 
-var Activity = require('../../components/presentation/activity/activity.jsx');
-var AdminPanel = require('../../components/presentation/adminpanel/adminpanel.jsx');
-var DropdownBanner = require('../../components/presentation/dropdown-banner/banner.jsx');
-var Box = require('../../components/presentation/box/box.jsx');
-var Button = require('../../components/presentation/forms/button.jsx');
-var Carousel = require('../../components/presentation/carousel/carousel.jsx');
-var Intro = require('../../components/container/intro/intro.jsx');
-var Modal = require('../../components/presentation/modal/modal.jsx');
-var News = require('../../components/presentation/news/news.jsx');
-var Page = require('../../components/container/page/www/page.jsx');
-var Welcome = require('../../components/presentation/welcome/welcome.jsx');
+var Activity = require('../../components/activity/activity.jsx');
+var AdminPanel = require('../../components/adminpanel/adminpanel.jsx');
+var DropdownBanner = require('../../components/dropdown-banner/banner.jsx');
+var Box = require('../../components/box/box.jsx');
+var Button = require('../../components/forms/button.jsx');
+var Carousel = require('../../components/carousel/carousel.jsx');
+var Intro = require('../../components/intro/intro.jsx');
+var Modal = require('../../components/modal/modal.jsx');
+var News = require('../../components/news/news.jsx');
+var Page = require('../../components/page/www/page.jsx');
+var Welcome = require('../../components/welcome/welcome.jsx');
 
 require('./splash.scss');
 

src/views/wedo2/wedo2.jsx

@@ -2,7 +2,7 @@ var FormattedHTMLMessage = require('react-intl').FormattedHTMLMessage;
 var FormattedMessage = require('react-intl').FormattedMessage;
 var React = require('react');
 
-var Page = require('../../components/container/page/www/page.jsx');
+var Page = require('../../components/page/www/page.jsx');
 var render = require('../../lib/render.jsx');
 
 require('./wedo2.scss');