merge

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;
+}

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);
+}

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

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)
     ("<span class='date'>" + date.strftime("%A, %b %d %Y") +  "</span>").html_safe
   end

app/views/application/_products_index.html.erb

@@ -1,13 +1,12 @@
-<ul>
-  <% @products.each do |product| %>
-  <% if product.image != nil %>
-  <strong>Image:</strong>
-  <li class="image"><%= product.image_stored? ? image_tag(product.image.thumb('80x60').url) : "" %></li>
-  <% elsif %>
-  <li class="image"><%= image_tag "no_image.png", size: "80x60", alt: "Robots"  %></li>
-  <% end %>
-  <li><%= link_to product.name, product_path(product.id) %></li>
-  <li> Price: <%= product.price %></li>
-  <li>In Stock: <%= product.quantity %></li>
-  <% end %>
-</ul>
+  <ul class='row small-up-4'>
+    <% @products.each do |product| %>
+    <li class="column text-center">
+      <%= product_image(product) %>
+      <ul 'row small-up-3' >
+        <li class="column text-center"><h2><%= link_to product.name, product_path(product.id) %></h2></li>
+        <li class="product-info column text-center"> $ <%= product.price %>0</li>
+        <li class="product-info notice column text-center">Only <%= product.quantity %> left!</li>
+      </ul>
+    </li>
+    <% end %>
+  </ul>

app/views/layouts/application.html.erb

@@ -10,7 +10,7 @@
   <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
 
   <!-- ROBITS cute font -->
-  <link href="https://fonts.googleapis.com/css?family=Chelsea+Market" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css?family=Chelsea+Market|Rubik" rel="stylesheet">
   <%= csrf_meta_tags %>
 </head>
 
@@ -27,42 +27,44 @@
         </ul>
       </section>
 
-    <div class="lower-link-area">
-      <section class="small-12 columns top-bar-left">
-        <!-- Make this unordered list horizontal at medium and larger screens & verticle on small ones  -->
-        <ul class="vertical menu medium-horizontal" data-responsive-menu="accordion medium-dropdown">
-          <li>
-            <%= link_to 'SHOP ALL', products_path %>
-          </li>
-
-          <li>
-            <%= link_to 'CATEGORIES', categories_path %>
-            <!-- Submenu of Categories -->
-            <ul class="menu vertical">
-              <% category.each do |f| %>
-              <li>
-                <%= link_to "#{f.name}", category_path(f.id) %>
-              </li>
-              <% end %>
-            </ul>
-          </li>
+      <div class="lower-link-area">
+        <section class="small-12 columns top-bar-left">
+          <!-- Make this unordered list horizontal at medium and larger screens & verticle on small ones  -->
+          <ul class="vertical menu medium-horizontal" data-responsive-menu="accordion medium-dropdown">
+            <li>
+              <%= link_to 'SHOP ALL', products_path %>
+            </li>
 
-          <li>
-            <%= link_to 'MERCHANTS', merchants_path %>
-            <!-- Submenu of Merchants -->
-            <ul class="menu vertical">
-              <% merchant.each do |f| %>
-              <li>
-                <%= link_to "#{f.user_name}", merchant_path(f.id) %>
-              </li>
-              <% end %>
+            <li>
+              <%= link_to 'CATEGORIES', categories_path %>
+              <!-- Submenu of Categories -->
+              <ul class="menu vertical">
+                <% category.each do |f| %>
+                <li>
+                  <%= link_to "#{f.name}", category_path(f.id) %>
+                </li>
+                <% end %>
+              </ul>
+            </li>
 
-            </ul>
-          </li>
-        </section>
+            <li>
+              <%= link_to 'MERCHANTS', merchants_path %>
+              <!-- Submenu of Merchants -->
+              <ul class="menu vertical">
+                <% merchant.each do |f| %>
+                <li>
+                  <%= link_to "#{f.user_name}", merchant_path(f.id) %>
+                </li>
+                <% end %>
 
-        <section>
+              </ul>
+            </li>
+          </section>
 
+          <section>
+          <% if session[:merchant_id] %>
+             <%= button_to "Merchant Control", sessions_merchant_login_path, method: :get %>
+           <% end %>
           <ul class="menu top-bar-right">
             <li><%= login_status %></li>
             <li><%= login_button %></li>

app/views/products/_form.html.erb

@@ -40,6 +40,7 @@
 
 <li class="field">
   <%= f.label :Category %><br>
+  <li>Hold command and shift to select more than one category</li>
   <%= f.select :category_ids, Category.all.collect{|category| [category.name, category.id]}, {}, {multiple: true}%>
 </li>
 

app/views/products/show.html.erb

@@ -47,6 +47,11 @@
     <% f.rating.times do |f| %>
     <%= image_tag "robot.png", size: "18x18", alt: "Robots" %>
     <% end %>
+    <% if current_merchant %>
+    <li>By: <%= "#{current_merchant.user_name}"%> </li>
+    <% else %>
+    <li>By: Anonymous</li>
+    <% end %>
     <% if f.description != nil %>
     <li><%= f.description %></li>
     <% end %>

app/views/sessions/_welcome.html.erb

@@ -0,0 +1,6 @@
+<section class="welcome-message small-block-grid-1 text-center the-grid">
+
+<h2 class='column'>WELCOME TO ROBITS </h2>
+
+<h3 class='column'>Somewhere you belong</h3>
+</section>

app/views/sessions/index.html.erb

@@ -1,7 +1 @@
-<h3>HOMEPAGE | WELCOME TO ROBITS </h3>
-
-<h4>Somewhere you belong</h4>
-
-<p>
-  THIS IS THE GENERIC INDEX PAGE
-</p>
+<%= render partial: "welcome" %>

app/views/sessions/index_log_in.html.erb

@@ -1,7 +1 @@
-<%# if session[:merchant_id] %>
-  <!-- <p>Login Successful! Welcome! <%# @current_merchant.user_name %></p> -->
-<%# end %>
-
-<h3>HOMEPAGE | WELCOME TO ROBITS </h3>
-
-<h4>Somewhere you belong</h4>
+<%= render partial: "welcome" %>

app/views/sessions/index_log_out.html.erb

@@ -1,9 +1 @@
-<%# if session[:merchant_id].nil? %>
-  <%# if flash[:error] %>
-    <!-- <p><%# flash[:error] %></p> -->
-  <%# end %>
-<%# end %>
-
-<h3>HOMEPAGE | WELCOME TO ROBITS </h3>
-
-<h4>Somewhere you belong</h4>
+<%= render partial: "welcome" %>

public/system/dragonfly/development/2016/10/28/1dvf68zqyh_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/2czupg77pc_geek_coffee_5.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: geek_coffee_5.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/2p9j4rbws6_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/2tgmv63qiq_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/4dt1a36u8r_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/6487gbhqf8_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/6r4imr3hb4_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/6re90j2ssg_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/8eml8ec93j_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/9f41i1s2jc_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/9lwsfkzvek_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/9npip9672_baby_cloth.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: baby-cloth.jpg
+model_class: Product
+model_attachment: image

public/system/dragonfly/development/2016/10/28/tl2pbvc16_tishirt.jpg.meta.yml

@@ -0,0 +1,4 @@
+---
+name: tishirt.jpg
+model_class: Product
+model_attachment: image

test/controllers/categories_controller_test.rb

@@ -16,11 +16,6 @@ class CategoriesControllerTest < ActionController::TestCase
     assert_equal assigns(:category), categories(:one)
   end
 
-  def login_a_user
-    request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:github]
-    get :create, { provider: "github" }
-  end
-
   test "should get the new form when a logged-in User create a new category" do
     session[:merchant_id] = merchants(:one).id
     get :new