diff --git a/app/assets/stylesheets/profile.css.scss b/app/assets/stylesheets/profile.css.scss index db1dbac..b6e7ca2 100644 --- a/app/assets/stylesheets/profile.css.scss +++ b/app/assets/stylesheets/profile.css.scss @@ -1,9 +1,46 @@ /* User profile */ + .user_info h2 { - display: inline; + line-height: 45px; + text-align: center; } -.user_info h5 { - display: inline; - padding-left: 10px; + +.user_info h5 { + margin-right: 10px; + text-align: right; +} + +.balance { + padding: 12px 0; + text-align: center; + font-family: monospace; + font-size: 16px; + width: 60%; + margin: auto; + background-color: #FF7F00; + color: white; +} + +.stats{ + width: 60%; + margin: auto; +} + +.stats h4 { + text-transform: uppercase; + font-family: monospace; + background-color: #333; + color: white; + padding: 5px 10px; + margin-top: 15px; +} + +.stats ul { + list-style-type: none; + padding: 0 0 0 15px; + margin: 0px; +} + +.stats li { } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9225cc3..154d1ef 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -4,7 +4,7 @@ class UsersController < ApplicationController def show @user = User.find_by_id(params[:id]) || current_user @orders = @user.orders.includes(:products).order(:created_at).reverse_order.paginate(page: params[:page]) - @products = @user.products.select("products.*", "sum(order_items.count) as count").group(:product_id) + @products = @user.products.select("products.*", "sum(order_items.count) as count").group(:product_id).order("count desc") @categories = @user.products.select("products.category", "sum(order_items.count) as count").group(:category) end diff --git a/app/views/products/_category.html.erb b/app/views/products/_category.html.erb deleted file mode 100644 index 7f92718..0000000 --- a/app/views/products/_category.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= simple_format(pluralize(category.count, category.category)) %> diff --git a/app/views/products/_product_row.html.erb b/app/views/products/_product_row.html.erb index cc1e384..dbf84e4 100644 --- a/app/views/products/_product_row.html.erb +++ b/app/views/products/_product_row.html.erb @@ -1 +1,3 @@ -<%= simple_format(pluralize(product.count, product.name)) %> +