diff --git a/front-api/Gemfile b/front-api/Gemfile index 29600e5..f9cfa9b 100644 --- a/front-api/Gemfile +++ b/front-api/Gemfile @@ -16,7 +16,6 @@ end gem "sinatra" - gem "sinatra-activerecord" gem "json" gem 'puma' diff --git a/front-api/app.rb b/front-api/app.rb index 460aa9a..86501f8 100644 --- a/front-api/app.rb +++ b/front-api/app.rb @@ -7,6 +7,7 @@ Dir[File.dirname(__FILE__) + '/models/*.rb'].each {|file| require file } set :bind, '0.0.0.0' + before do content_type :json # TODO: before running to production change this so that only specific diff --git a/front-api/controllers/item.rb b/front-api/controllers/item.rb index bdf7b2e..fb0a82c 100644 --- a/front-api/controllers/item.rb +++ b/front-api/controllers/item.rb @@ -10,9 +10,6 @@ def prepare_items_for_mass_display(items) ]) end - - - def offset_and_limit_invalid?(offset, limit) offset < 0 or limit <= 0 or limit > 100 end diff --git a/front-ui/app/components/items/itemWithDetailsPage.js b/front-ui/app/components/items/itemWithDetailsPage.js index 295457b..6871d18 100644 --- a/front-ui/app/components/items/itemWithDetailsPage.js +++ b/front-ui/app/components/items/itemWithDetailsPage.js @@ -13,24 +13,29 @@ var ItemWithDetailsPage = React.createClass({ return ( - -
-
-

{this.state.item.get('name')}

-
-
{this.state.item.get('list_price')} KM
-
{this.state.item.get('description')}
-
- +
+ + + -
-
+ +
+
+

{this.state.item.get('name')}

+
+ +
{this.state.item.get('list_price')} KM
+
{this.state.item.get('description')}
+
+ quantitative descriptions
-
+
); }, diff --git a/front-ui/app/css/carousel.css b/front-ui/app/css/carousel.css index 1e1cebd..ece4c23 100644 --- a/front-ui/app/css/carousel.css +++ b/front-ui/app/css/carousel.css @@ -15,11 +15,15 @@ -ms-user-select: none; user-select: none; } + + + .arrow { position: relative; top: -100px; padding: 10px; } + .carousel-stage { width: 300px; height: 200px; diff --git a/front-ui/build/index.html b/front-ui/build/index.html index 3332b31..8352788 100644 --- a/front-ui/build/index.html +++ b/front-ui/build/index.html @@ -3,6 +3,7 @@ +