diff --git a/app/assets/images/babay-cloth_2.jpg b/app/assets/images/babay-cloth_2.jpg new file mode 100644 index 0000000000..8472fe400a Binary files /dev/null and b/app/assets/images/babay-cloth_2.jpg differ diff --git a/app/assets/images/baby-cloth.jpg b/app/assets/images/baby-cloth.jpg new file mode 100644 index 0000000000..a6c133579f Binary files /dev/null and b/app/assets/images/baby-cloth.jpg differ diff --git a/app/assets/images/baby_robot .jpg b/app/assets/images/baby_robot .jpg new file mode 100644 index 0000000000..3bec6647ac Binary files /dev/null and b/app/assets/images/baby_robot .jpg differ diff --git a/app/assets/images/bag-flappy-disk.jpg b/app/assets/images/bag-flappy-disk.jpg new file mode 100644 index 0000000000..3947671aa1 Binary files /dev/null and b/app/assets/images/bag-flappy-disk.jpg differ diff --git a/app/assets/images/bag.png b/app/assets/images/bag.png new file mode 100644 index 0000000000..eea56813f9 Binary files /dev/null and b/app/assets/images/bag.png differ diff --git a/app/assets/images/coffe_mug_3.jpg b/app/assets/images/coffe_mug_3.jpg new file mode 100644 index 0000000000..c9f5b1227f Binary files /dev/null and b/app/assets/images/coffe_mug_3.jpg differ diff --git a/app/assets/images/coffe_mug_4.jpg b/app/assets/images/coffe_mug_4.jpg new file mode 100644 index 0000000000..4cc76c0b21 Binary files /dev/null and b/app/assets/images/coffe_mug_4.jpg differ diff --git a/app/assets/images/coffe_mug_7.jpg b/app/assets/images/coffe_mug_7.jpg new file mode 100644 index 0000000000..dd86ac8398 Binary files /dev/null and b/app/assets/images/coffe_mug_7.jpg differ diff --git a/app/assets/images/coffee_mug.jpg b/app/assets/images/coffee_mug.jpg new file mode 100644 index 0000000000..89952df5c0 Binary files /dev/null and b/app/assets/images/coffee_mug.jpg differ diff --git a/app/assets/images/coffee_mug_2.jpg b/app/assets/images/coffee_mug_2.jpg new file mode 100644 index 0000000000..92b3466957 Binary files /dev/null and b/app/assets/images/coffee_mug_2.jpg differ diff --git a/app/assets/images/computer-bag.jpg b/app/assets/images/computer-bag.jpg new file mode 100644 index 0000000000..389d754262 Binary files /dev/null and b/app/assets/images/computer-bag.jpg differ diff --git a/app/assets/images/computer_bag.jpg b/app/assets/images/computer_bag.jpg new file mode 100644 index 0000000000..fee9ca28c1 Binary files /dev/null and b/app/assets/images/computer_bag.jpg differ diff --git a/app/assets/images/computer_pad.jpg b/app/assets/images/computer_pad.jpg new file mode 100644 index 0000000000..bd0ca3a9a4 Binary files /dev/null and b/app/assets/images/computer_pad.jpg differ diff --git a/app/assets/images/computer_tote_bag.jpg b/app/assets/images/computer_tote_bag.jpg new file mode 100644 index 0000000000..2512eb3cad Binary files /dev/null and b/app/assets/images/computer_tote_bag.jpg differ diff --git a/app/assets/images/geek_coffee_5.jpg b/app/assets/images/geek_coffee_5.jpg new file mode 100644 index 0000000000..61e98c351b Binary files /dev/null and b/app/assets/images/geek_coffee_5.jpg differ diff --git a/app/assets/images/pen_holders.jpg b/app/assets/images/pen_holders.jpg new file mode 100644 index 0000000000..74e6c62680 Binary files /dev/null and b/app/assets/images/pen_holders.jpg differ diff --git a/app/assets/images/t-shirt4.jpg b/app/assets/images/t-shirt4.jpg new file mode 100644 index 0000000000..0208dd372b Binary files /dev/null and b/app/assets/images/t-shirt4.jpg differ diff --git a/app/assets/images/t-shirt_9.jpg b/app/assets/images/t-shirt_9.jpg new file mode 100644 index 0000000000..71f64e8b07 Binary files /dev/null and b/app/assets/images/t-shirt_9.jpg differ diff --git a/app/assets/images/t_shirt.jpg b/app/assets/images/t_shirt.jpg new file mode 100644 index 0000000000..42eba31aaa Binary files /dev/null and b/app/assets/images/t_shirt.jpg differ diff --git a/app/assets/images/t_shirt_10.jpg b/app/assets/images/t_shirt_10.jpg new file mode 100644 index 0000000000..09ef5cdc7b Binary files /dev/null and b/app/assets/images/t_shirt_10.jpg differ diff --git a/app/assets/images/tie.jpg b/app/assets/images/tie.jpg new file mode 100644 index 0000000000..74f5aed741 Binary files /dev/null and b/app/assets/images/tie.jpg differ diff --git a/app/assets/images/tishirt.jpg b/app/assets/images/tishirt.jpg new file mode 100644 index 0000000000..55c8bc61ed Binary files /dev/null and b/app/assets/images/tishirt.jpg differ diff --git a/app/assets/images/tot_bag_2.jpg b/app/assets/images/tot_bag_2.jpg new file mode 100644 index 0000000000..92ec193e37 Binary files /dev/null and b/app/assets/images/tot_bag_2.jpg differ diff --git a/app/assets/images/tot_bags.jpg b/app/assets/images/tot_bags.jpg new file mode 100644 index 0000000000..3ad8702ffc Binary files /dev/null and b/app/assets/images/tot_bags.jpg differ diff --git a/app/assets/images/travel_mug .jpg b/app/assets/images/travel_mug .jpg new file mode 100644 index 0000000000..c01bd61292 Binary files /dev/null and b/app/assets/images/travel_mug .jpg differ diff --git a/app/assets/images/wedding-cap.webp b/app/assets/images/wedding-cap.webp new file mode 100644 index 0000000000..83a0b36764 Binary files /dev/null and b/app/assets/images/wedding-cap.webp differ diff --git a/app/assets/images/wedding_shirt.webp b/app/assets/images/wedding_shirt.webp new file mode 100644 index 0000000000..5ff9ac164c Binary files /dev/null and b/app/assets/images/wedding_shirt.webp differ diff --git a/app/assets/images/women-shirt.jpg b/app/assets/images/women-shirt.jpg new file mode 100644 index 0000000000..f1fa2f3b28 Binary files /dev/null and b/app/assets/images/women-shirt.jpg differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index ec3f83dcc1..79af78e508 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,10 +15,15 @@ *= require foundation_and_overrides */ +body { + background-color: rgba(245,242,225, 0.5); + font-family: 'Rubik', sans-serif; +} h1, .title-area, .name { margin: 0 0; - background-color: rgb(245,242,225) + width: 100rem; + background-color: rgb(245,242,225); } .name { @@ -33,9 +38,19 @@ a:hover { color: #cacaca; } +.row.top-bar { + max-width: 100rem; + margin-left: none; + margin-right: none; +} + +.top-bar { + box-shadow:0px 1px 1px rgb(136,149,194); +} + .top-bar, .top-bar ul { - background-color: rgb(136,149,194); - padding: 0; + background-color: rgb(136,149,194); + padding: 0; } .dropdown.menu.medium-horizontal > li.is-dropdown-submenu-parent > a::after { @@ -51,3 +66,29 @@ a:hover { font-family: 'Chelsea Market', cursive; } + +li.column { + list-style: none; +} + +.small-up-4 > li { + margin-bottom: 2.25rem; + margin-top: 2rem; +} + + +h2 { + color: rgb(136, 149, 194); + text-shadow: 2px 2px 3px rgb(82, 82, 142); + font-family: 'Chelsea Market', cursive; +} + +.product-info { + color: rgb(82, 82, 142); + font-family: 'Rubik', sans-serif; +} + +.notice { + font-weight: bold; + font-size: 1rem; +} diff --git a/app/assets/stylesheets/sessions.scss b/app/assets/stylesheets/sessions.scss index ccb1ed25b2..fd70ac12fc 100644 --- a/app/assets/stylesheets/sessions.scss +++ b/app/assets/stylesheets/sessions.scss @@ -1,3 +1,20 @@ // Place all the styles related to the Sessions controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +.welcome-message { + margin-top: 2rem; +} + +.welcome-message > h2, .welcome-message > h3 { + font-family: 'Chelsea Market', cursive; + text-shadow: 2px 2px 3px rgb(136, 149, 194); +} + +.welcome-message > h2 { + color: rgb(82, 82, 142); +} + +.welcome-message > h3 { + color: rgb(136, 149, 194); +} diff --git a/app/controllers/order_items_controller.rb b/app/controllers/order_items_controller.rb index da79b10f2b..3c6f06cecc 100644 --- a/app/controllers/order_items_controller.rb +++ b/app/controllers/order_items_controller.rb @@ -30,7 +30,7 @@ def ship order = @order_item.order order.complete_order - redirect_to orders_path + redirect_to order_order_items_path(@order_item.order) end @@ -46,6 +46,6 @@ def get_order_item end def order_item_params - params.require(:order_item).permit(:quantity) + params.require(:order_item).permit(:quantity, :shipped) end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bf9925e00a..77e06ff610 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -44,6 +44,21 @@ def sign_up_button(**kwargs) link_to text, path, method: method, **kwargs end + def product_image(product, **kwargs) + if product.image.nil? + path = "no_image.png" + dimensions = "80x60" + text = "Robits" + else + path = (product.image_stored? ? product.image.thumb('80x60').url : "") + dimensions = "80x60" + text = "Buy Me" + end + image_tag path, size: dimensions, alt: text + end + + + def render_date(date) ("" + date.strftime("%A, %b %d %Y") + "").html_safe end diff --git a/app/views/application/_products_index.html.erb b/app/views/application/_products_index.html.erb index 388901a648..d9755245ba 100644 --- a/app/views/application/_products_index.html.erb +++ b/app/views/application/_products_index.html.erb @@ -1,13 +1,12 @@ - + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8f991d1763..b9d67c9ea6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,7 +10,7 @@ <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> - + <%= csrf_meta_tags %> @@ -27,42 +27,44 @@ -
-
- -
+
+ <% if session[:merchant_id] %> + <%= button_to "Merchant Control", sessions_merchant_login_path, method: :get %> + <% end %>