diff --git a/front-ui/app/app.js b/front-ui/app/app.js index f07665b..6e3cf9a 100644 --- a/front-ui/app/app.js +++ b/front-ui/app/app.js @@ -1,12 +1,9 @@ - var App = function() { this.bootstrap = function() { // here goes all app initialization and bootstraping logic - //this.router = new Router(); - //Backbone.history.start(); + // nothing at the moment }; }; - var app = new App(); module.exports = app; diff --git a/front-ui/app/components/browsing/byCategory.js b/front-ui/app/components/browsing/byCategory.js new file mode 100644 index 0000000..3ea5e97 --- /dev/null +++ b/front-ui/app/components/browsing/byCategory.js @@ -0,0 +1,13 @@ +var React = require('react'); + +var ByCategory = React.createClass({ + render: function() { + return ( +
+

Browse products by category

+
+ ); + } +}); + +module.exports = ByCategory; diff --git a/front-ui/app/components/browsing/bySection.js b/front-ui/app/components/browsing/bySection.js new file mode 100644 index 0000000..7da196e --- /dev/null +++ b/front-ui/app/components/browsing/bySection.js @@ -0,0 +1,19 @@ +var React = require('react'), + Router = require('react-router'); + +var BySection = React.createClass({ + mixins: [Router.State], + render : function() { + return (
+ +
+ Here goes section for refining search, by section +
+
+

Welcome to section {this.getParams().id}

+
+
) + } +}); + +module.exports = BySection; diff --git a/front-ui/app/components/browsing/bySubcategory.js b/front-ui/app/components/browsing/bySubcategory.js new file mode 100644 index 0000000..e69de29 diff --git a/front-ui/app/components/items/itemPage.js b/front-ui/app/components/items/itemPage.js new file mode 100644 index 0000000..4ae8c25 --- /dev/null +++ b/front-ui/app/components/items/itemPage.js @@ -0,0 +1,13 @@ +var React = require('react') + ItemWithDetailsPage = require('../itemWithDetailsPage'); +var ItemPage = React.createClass({ + render: function() { + return ( +
+ +
+ ); + } +}); + +module.exports = ItemPage; diff --git a/front-ui/app/components/rootApp.js b/front-ui/app/components/rootApp.js new file mode 100644 index 0000000..780748a --- /dev/null +++ b/front-ui/app/components/rootApp.js @@ -0,0 +1,34 @@ +var React = require('react'), + SectionsListComponent = require('./sectionsListComponent'), + Router = require('react-router'), + RouteHandler = Router.RouteHandler; + +var RootApp = React.createClass({ + + render: function() { + + return ( + +
+ +
+

Ribica.ba

+
+
+ +
+
+ + + +
+ +
+ + ); + } +}); + +module.exports = RootApp; diff --git a/front-ui/app/components/sectionsListComponent.js b/front-ui/app/components/sectionsListComponent.js index 3757a0a..50291a9 100644 --- a/front-ui/app/components/sectionsListComponent.js +++ b/front-ui/app/components/sectionsListComponent.js @@ -29,7 +29,7 @@ var SectionsListComponent = React.createClass({ }.bind(this)}); }, onMouseOver: function(section) { - console.log('mouse over!', section); + //console.log('mouse over!', section); this.setState({ hoveredSection: section.get('id') diff --git a/front-ui/app/components/startPage/startPage.js b/front-ui/app/components/startPage/startPage.js new file mode 100644 index 0000000..bbd692d --- /dev/null +++ b/front-ui/app/components/startPage/startPage.js @@ -0,0 +1,24 @@ +var React = require('react'), + Router = require('react-router'), + RouteHandler = Router.RouteHandler, + AllItems = require('../allItems'); + +var StartPage = React.createClass({ + render : function() { + return ( +
+ +
+ left content +
+
+

Ribica Start Page

+ + +
+
+ ) + } +}); + +module.exports = StartPage; diff --git a/front-ui/app/controllers/itemDetailsController.js b/front-ui/app/controllers/itemDetailsController.js deleted file mode 100644 index 97f8009..0000000 --- a/front-ui/app/controllers/itemDetailsController.js +++ /dev/null @@ -1,12 +0,0 @@ -var StartPageSectionsView = require('../views/startPageSectionsView'), - ItemDetailsView = require('../views/itemDetailsView'); - -function ItemDetailsController(id) { - var sectionsView = new StartPageSectionsView(); - sectionsView.render(); - - var itemDetailsView = new ItemDetailsView(id); - itemDetailsView.render(); -} - -module.exports = ItemDetailsController; diff --git a/front-ui/app/rapp.js b/front-ui/app/rapp.js index 3e14692..67cb2c5 100644 --- a/front-ui/app/rapp.js +++ b/front-ui/app/rapp.js @@ -1,110 +1,31 @@ var React = require('react'); -var ItemList = require('./components/itemList'); var Router = require('react-router'), Route = Router.Route, DefaultRoute = Router.DefaultRoute; - -var ItemWithDetailsPage = require('./components/itemWithDetailsPage'); - var RouteHandler = Router.RouteHandler; - var Navigation = Router.Navigation; + +var ItemWithDetailsPage = require('./components/itemWithDetailsPage'); +var ItemList = require('./components/itemList'); var SectionsListComponent = require('./components/sectionsListComponent'); - var AllItems = require('./components/allItems'); +var RootApp = require('./components/rootApp'); +var StartPage = require('./components/startPage/startPage'); +var ByCategory = require('./components/browsing/byCategory'); +var BySection = require('./components/browsing/bySection'); -var RApp = React.createClass({ +var ItemPage = require('./components/items/itemPage'); - render: function() { - - return ( - -
- -
-

Ribica.ba

-
-
- -
-
- - - -
- -
- - ); - } -}); - -var StartPage = React.createClass({ - render : function() { - return ( -
- -
- left content -
-
-

Ribica Start Page

- - -
-
- ) - } -}); - -var ByCat = React.createClass({ - render: function() { - return ( -
By CAtegoriy stuff
- ); - } - -}); - -var BySection = React.createClass({ - mixins: [Router.State], - render : function() { - return (
- -
- Here goes section for refining search, by section -
-
-

Welcome to section {this.getParams().id}

-
-
) - } -}); - - -var Artikal = React.createClass({ - render: function() { - return ( -
- - - -
- ); - } -}); var routes = ( - + - + - +