Ada-C11 · qqdipps · May 6, 2019 · May 6, 2019 · May 6, 2019 · May 6, 2019
diff --git a/app/assets/images/favicon.png b/app/assets/images/favicon.png
diff --git a/app/assets/images/intangible.png b/app/assets/images/intangible.png
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -19,7 +19,17 @@
 .nav-item {
     color: rgba(131, 11, 142, 0.842);
   }
-
+
+
+.navbar-brand:hover{
+  font-family: 'League Script', Helvetica, Arial, sans-serif;
+  margin-right: 11px;
+}
+
+.navbar-brand {
+  margin-right: 20px;
+}
+
 .nav_bar {
   list-style: none;
   display: flex;
@@ -28,3 +38,63 @@
   padding: 20px 10px;
   margin: 0;
 }
+
+
+.form-control:focus {
+    color: #495057;
+    background-color: #fff;
+    color: rgb(255, 157, 255);
+    border-color: rgb(255, 157, 255);
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem rgba(255, 157, 255, 0.25);
+}
+
+.categories input {
+    margin-left: 20px;
+}
+
+.btn-outline-success {
+    color: rgba(131, 11, 142, 0.842);
+    background-color: transparent;
+    background-image: none;
+    border-color: rgba(131, 11, 142, 0.842);
+}
+
+.btn-outline-success:hover{
+  background-color:  rgba(131, 11, 142, 0.842);
+  border-color: rgba(131, 11, 142, 0.842);
+}
+
+.btn-outline-success:not(:disabled):not(.disabled):active:focus, .btn-outline-success:not(:disabled):not(.disabled).active:focus, .show > .btn-outline-success.dropdown-toggle:focus {
+  box-shadow: 0 0 0 0.2rem rgba(131, 11, 142, 0.842);
+}
+
+.btn-outline-success:not(:disabled):not(.disabled):active, .btn-outline-success:not(:disabled):not(.disabled).active, .show > .btn-outline-success.dropdown-toggle {
+  color: #fff;
+  background-color: rgba(131, 11, 142, 0.842);
+  border-color: rgba(131, 11, 142, 0.295);
+}
+
+.btn-outline-success:focus, .btn-outline-success.focus {
+    box-shadow: 0 0 0 0.2rem  rgba(131, 11, 142, 0.842);
+}
+
+
+#cart {
+ margin-right: 10px;
+}
+
+.dash-link {
+  margin-left: 0px;
+  margin-right: 10px;
+}
+
+.log-in {
+  margin-left: 15px;
+  margin-right: 10px;
+}
+
+.sm-margin {
+  margin-top: 1em;
+}
+
diff --git a/app/assets/stylesheets/homepages.scss b/app/assets/stylesheets/homepages.scss
@@ -12,6 +12,7 @@ body {
   text-align: center;
 }
 
+
 .bold {
   font-weight: 900;
   -webkit-text-stroke: #ff9dff 1px;
@@ -21,7 +22,9 @@ body {
   color: #ff9dff;
 }
 
+
 main {
+  margin-top: 2.0em;
   margin-left: 2.5em;
   margin-right: 2.5em;
   margin-bottom: 5vw;
@@ -110,6 +113,14 @@ a:hover {
 .nav-link {
   color: rgba(0, 0, 0, 0.5);
 }
+// .nav_bar {
+//   list-style: none;
+//   display: flex;
+//   flex-wrap: wrap;
+//   justify-content: center; 
+//   padding: 20px 10px;
+//   margin: 0;
+// }
 
 .nav_bar_header ul li {
   padding: 20px 30px;
@@ -130,16 +141,71 @@ a:hover {
 }
 
 .jumbotron {
-  margin-top: 36px;
-  padding-top: 36px;
-  padding-bottom: 36px;
   display: grid;
   grid-template: 3fr / 1fr 1fr;
-  grid-gap: 3vw;
 }
 
-.jumbotron form {
-  display: inline;
-}
-
-
+.jumbotron h3 {
+  grid-column: 1 / 3;
+}
+
+// #footer {
+//   position: absolute;
+//   bottom: 0;
+//   width: 100%;
+//   height: 2.5rem; 
+// }
+
+.img {
+  border: none;
+  margin-top: -10px;
+}
+
+
+/* ----------------------------------------------
+ * Generated by Animista on 2019-5-10 1:57:28
+ * w: http://animista.net, t: @cssanimista
+ * ---------------------------------------------- */
+
+/**
+ * ----------------------------------------
+ * animation roll-in-blurred-left
+ * ----------------------------------------
+ */
+ @-webkit-keyframes roll-in-blurred-left {
+  0% {
+    -webkit-transform: translateX(-1000px) rotate(-720deg);
+            transform: translateX(-1000px) rotate(-720deg);
+    -webkit-filter: blur(50px);
+            filter: blur(50px);
+    opacity: 0;
+  }
+  100% {
+    -webkit-transform: translateX(0) rotate(0deg);
+            transform: translateX(0) rotate(0deg);
+    -webkit-filter: blur(0);
+            filter: blur(0);
+    opacity: 1;
+  }
+}
+@keyframes roll-in-blurred-left {
+  0% {
+    -webkit-transform: translateX(-1000px) rotate(-720deg);
+            transform: translateX(-1000px) rotate(-720deg);
+    -webkit-filter: blur(50px);
+            filter: blur(50px);
+    opacity: 0;
+  }
+  100% {
+    -webkit-transform: translateX(0) rotate(0deg);
+            transform: translateX(0) rotate(0deg);
+    -webkit-filter: blur(0);
+            filter: blur(0);
+    opacity: 1;
+  }
+}
+
+.roll-in-blurred-left {
+	-webkit-animation: roll-in-blurred-left 0.65s cubic-bezier(0.230, 1.000, 0.320, 1.000) both;
+	        animation: roll-in-blurred-left 0.65s cubic-bezier(0.230, 1.000, 0.320, 1.000) both;
+}
diff --git a/app/assets/stylesheets/merchants.scss b/app/assets/stylesheets/merchants.scss
@@ -1,3 +1,7 @@
 // Place all the styles related to the Merchants controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.merchant-dashboard td a:hover {
+    color: rgb(255, 157, 255);
+}
diff --git a/app/assets/stylesheets/orders.scss b/app/assets/stylesheets/orders.scss
@@ -1,3 +1,18 @@
 // Place all the styles related to the Orders controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
+.item.card {
+  width: 300px;
+
+}
+
+.flex {
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-around;
+}
+
+.checkout {
+  margin-top: 2em;
+}
diff --git a/app/assets/stylesheets/products.scss b/app/assets/stylesheets/products.scss
@@ -46,3 +46,6 @@ h4 {
     font-weight: bolder;
 }
 
+.categories input {
+  margin-left: 20px;
+}
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
@@ -11,7 +11,7 @@ def new
   end
 
   def create
-    if @login_merchant # if merchant is logged in
+    if @login_merchant
       @category = Category.new(category_params)
       is_successful = @category.save
 

diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb
@@ -21,7 +21,7 @@ def create
       flash.now[:error] = "Could Not Add To Cart: product not available"
       redirect_to products_path
 
-      # check if requested quanitity is available
+      # check if requested quantity is available
     elsif item.quantity && @product.stock < item.quantity
       flash.now[:error] = "Could Not Add To Cart: quantity selected is more than available stock"
       render "products/show", status: :bad_request
@@ -32,7 +32,7 @@ def create
       @order.items << item
 
       if item.valid?
-        flash[:success] = "#{@product.name} (quantity: #{item.quantity}) Successfully Added To Cart"
+        flash[:success] = "#{@product.name} (total quantity: #{item.quantity}) Successfully Added To Cart"
         redirect_to product_path(@product.id)
       else
         flash.now[:error] = "Could Not Add To Cart"

diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
@@ -68,10 +68,9 @@ def purchase
 
   private
 
-  # only partial params, update if more attributes are required.
   def order_params
     if params[:order][:cc_all]
-      params[:order][:cc_four] = params[:order][:cc_all][-4..-1] # front-end validation requires min 4 char input.
+      params[:order][:cc_four] = params[:order][:cc_all].length <= 4 ? params[:order][:cc_all] : params[:order][:cc_all][-4..-1]
     end
     params.require(:order).permit(:shopper_name, :shopper_email, :shopper_address, :cc_exp, :cc_four, :status)
   end

diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb
@@ -77,16 +77,8 @@ def update
 
   def toggle_inactive
     if @login_merchant && @product.valid?
-      if @product.merchant_id == @login_merchant.id
-        @product.toggle(:active)
-        # raise
-        is_successful = @product.save
-
-        if is_successful
-          flash[:success] = "Product status changed successfully"
-        else
-          flash[:error] = "Product status not changed successfully"
-        end
+      if @product.merchant_id == @login_merchant.id && @product.toggle(:active).save
+        flash[:success] = "Product status changed successfully"
       else
         flash[:error] = "You may only change the status of your own products"
       end

diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb
@@ -1,8 +1,7 @@
 class ReviewsController < ApplicationController
   def create
     @product = Product.find(params[:product_id])
-    # Checks if merchant signed in that they are not reviewing their own product.
-    if @product.merchant_id == session[:merchant_id]
+    if !@product || @product.merchant_id == session[:merchant_id]
       flash.now[:error] = "Merchants cannot review their own product."
       render "products/show", status: :bad_request
     else

diff --git a/app/views/categories/create.html.erb b/app/views/categories/create.html.erb
diff --git a/app/views/homepages/index.html.erb b/app/views/homepages/index.html.erb
@@ -1,11 +1,12 @@
 <section id="mainpadding" id="background-image-magical">
 
     <h1>Intangibly</h1>
-    <p id="tagline">find your magic</p>
-
+    <p id="tagline" class= "magic roll-in-blurred-left "><%= image_tag "intangible.png", class: "img" %>find your magic</p>
     <% if session[:merchant_id] %>
     <% merchant = Merchant.find_by(id: session[:merchant_id]) %>
     <p class="centered-arial"><%= "You are currently logged in as #{merchant.username}" %></p> 
     <%# wrap in class for footer %>
     <% end %>
-</section>
+</section>
+
+
diff --git a/app/views/items/_item_form.html.erb b/app/views/items/_item_form.html.erb
@@ -3,9 +3,13 @@
 
   <div>
     <%= f.label :Quantity%>
+    <% if @product.stock > 0%>
     <%= f.number_field :quantity, required: true, in: [email protected] %>
+    <% else %>
+    <%= f.number_field :quantity, required: true, in: 0..1 %>
+    <%end%>
   </div>
   <div>
-    <%= f.submit action, class: "btn btn-sm btn-primary" %>
+    <%= f.submit action, class: "btn btn-info sm-margin" %>
   </div>
 <%end%>