Refactorx2 routes

.gitignore

@@ -7,6 +7,8 @@
 # Ignore bundler config.
 /.bundle
 coverage
+.DS_Store
+.vscode
 
 # Ignore all logfiles and tempfiles.
 /log/*

Gemfile

@@ -16,6 +16,7 @@ gem 'coffee-rails', '~> 4.2'
 gem 'jbuilder', '~> 2.5'
 
 gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bcrypt', '~> 3.1.7'
 
 group :development, :test do
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]

Gemfile.lock

@@ -1,52 +1,53 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.4.4)
+      actionpack (= 5.2.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailer (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (5.2.4.4)
+      activesupport (= 5.2.4.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       arel (>= 9.0)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
+    activestorage (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     arel (9.0.0)
+    bcrypt (3.1.16)
     bindex (0.8.1)
-    bootsnap (1.4.8)
+    bootsnap (1.4.9)
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
@@ -77,7 +78,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.0)
+    jbuilder (2.10.1)
       activesupport (>= 5.0.0)
     launchy (2.5.0)
       addressable (~> 2.7)
@@ -98,7 +99,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.2)
     msgpack (1.3.3)
-    nio4r (2.5.3)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     pg (1.2.3)
@@ -110,38 +111,38 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (5.2.4.4)
+      actioncable (= 5.2.4.4)
+      actionmailer (= 5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      activestorage (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 5.2.4.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.7.1)
-    rspec-core (3.9.2)
+    regexp_parser (1.8.2)
+    rspec-core (3.9.3)
       rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rspec-expectations (3.9.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
@@ -155,7 +156,7 @@ GEM
       rspec-expectations (~> 3.9)
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
-    rspec-support (3.9.3)
+    rspec-support (3.9.4)
     ruby_dep (1.5.0)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
@@ -170,14 +171,14 @@ GEM
       tilt (>= 1.1, < 3)
     shoulda-matchers (4.4.1)
       activesupport (>= 4.2.0)
-    simplecov (0.19.0)
+    simplecov (0.19.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+    simplecov-html (0.12.3)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -203,6 +204,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
   bootsnap (>= 1.1.0)
   byebug
   capybara

app/assets/stylesheets/application.css

@@ -25,12 +25,26 @@
  	font-family: "Marker Felt", fantasy;
  }
 
+ p {
+   color: black;
+   font-size: 15px;
+ }
+
+ p1 {
+   font-size: 17px;
+   color: white;
+ }
+
+#current-user {
+              color: white;
+              }
 ul{
   padding: 0px;
   text-align: center;
 }
 img{
-  width: 50%;
+  width:20%;
+  height:auto;
 }
 
 #cart-image{
@@ -99,6 +113,12 @@ section[id*='review'] {
    text-align: center;
  }
 
+ button{
+   text-align: center;
+   padding: 5px;
+    width: 30%;
+ }
+
  input[type=text], select {
   width: 100%;
   padding: 12px 20px;
@@ -135,6 +155,12 @@ form {
   background-color: red;
   color: white;
 }
+
+.notice-flash {
+  padding: 10px;
+  background-color: green;
+  color: white;
+}
 .success-flash {
   padding: 10px;
   background-color: green;

app/controllers/admin/base_controller.rb

@@ -0,0 +1,7 @@
+class Admin::BaseController < ApplicationController
+  before_action :require_admin
+
+  def require_admin
+    render file: "/public/404" unless current_admin?
+  end
+end

app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,5 @@
+class Admin::DashboardController < Admin::BaseController
+  def index
+    @orders = Order.all
+  end
+end

app/controllers/admin/merchants_controller.rb

@@ -0,0 +1,24 @@
+class Admin::MerchantsController < Admin::BaseController
+  def show
+    @merchant = Merchant.find(params[:merchant_id])
+  end
+  before_action :require_admin
+
+  def index
+    @merchants = Merchant.all
+  end
+
+  def disable
+    merchant = Merchant.find(params[:merchant_id])
+    merchant.disable_merchant
+    redirect_to '/admin/merchants'
+    flash[:notice] = "Merchant Account Is Now Disabled"
+  end
+
+  def enable
+    merchant = Merchant.find(params[:merchant_id])
+    merchant.enable_merchant
+    redirect_to '/admin/merchants'
+    flash[:notice] = "Merchant Account Is Now Enabled"
+  end
+end

app/controllers/admin/profile_orders_controller.rb

@@ -0,0 +1,8 @@
+class Admin::ProfileOrdersController < Admin::BaseController
+  def update
+    order = Order.find(params[:order_id])
+    order.update!(status: "Shipped")
+
+    redirect_to "/admin"
+  end
+end

app/controllers/admin/users_controller.rb

@@ -0,0 +1,9 @@
+class Admin::UsersController < Admin::BaseController
+  def index
+    @users = User.all
+  end
+
+  def show
+    @user = User.find(params[:id])
+  end
+end

app/controllers/application_controller.rb

@@ -1,10 +1,25 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
-  helper_method :cart
+  helper_method :cart, :current_user, :current_admin?, :current_merchant?, :current_user?
 
   def cart
     @cart ||= Cart.new(session[:cart] ||= Hash.new(0))
   end
 
+  def current_user
+    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+  end
+
+  def current_admin?
+    current_user && current_user.admin?
+  end
+
+  def current_merchant?
+    current_user && current_user.merchant?
+  end
+
+  def current_user?
+    current_user && current_user.user?
+  end
 end

app/controllers/cart_base_controller.rb

@@ -0,0 +1,7 @@
+class CartBaseController < ApplicationController
+  before_action :require_non_admin
+
+  def require_non_admin
+    render file: "/public/404" if current_admin?
+  end
+end

app/controllers/cart_controller.rb

@@ -1,4 +1,4 @@
-class CartController < ApplicationController
+class CartController < CartBaseController
   def add_item
     item = Item.find(params[:item_id])
     cart.add_item(item.id.to_s)
@@ -20,5 +20,28 @@ def remove_item
     redirect_to '/cart'
   end
 
+  def modify_quantity
+    item = Item.find(params[:item_id])
 
+    if params[:operation] == "add"
+      if item.inventory > session[:cart][item.id.to_s]
+        cart.add_item(item.id.to_s)
+        flash[:success] = "Another #{item.name} was successfully added to your cart"
+        redirect_to "/cart"
+      else
+        flash[:notice] = "Not Enough Inventory for #{item.name}"
+        redirect_to "/cart"
+      end
+    elsif params[:operation] == "subtract"
+      if session[:cart][item.id.to_s] > 1
+        cart.subtract_item(item.id.to_s)
+        flash[:success] = "A #{item.name} was successfully removed from your cart"
+        redirect_to "/cart"
+      else
+        session[:cart].delete(params[:item_id])
+        flash[:success] = "#{item.name} was successfully removed from your cart"
+        redirect_to '/cart'
+      end
+    end
+  end
 end