Destroy

Gemfile

@@ -20,7 +20,7 @@ gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+gem 'bcrypt', '~> 3.1.7'
 
 # Use Unicorn as the app server
 # gem 'unicorn'
@@ -41,4 +41,3 @@ group :development do
   gem 'spring'
   gem 'listen'
 end
-

Gemfile.lock

@@ -43,6 +43,7 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
+    bcrypt (3.1.12)
     bindex (0.5.0)
     builder (3.2.3)
     byebug (10.0.2)
@@ -160,6 +161,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
   byebug
   jbuilder (~> 2.0)
   jquery-rails
@@ -173,4 +175,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

app/assets/javascripts/reservation.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/restaurant.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/session.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/javascripts/user.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

app/assets/stylesheets/reservation.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the reservation controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/restaurant.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the restaurant controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/session.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the session controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/user.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the user controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/application_controller.rb

@@ -2,4 +2,19 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  def ensure_logged_in
+    unless current_user
+      flash[:notice] = "Please log in"
+      redirect_to new_session_url
+    end
+  end
+
+  private
+
+  def current_user
+    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+  end
+
+  helper_method :current_user
 end

app/controllers/reservations_controller.rb

@@ -0,0 +1,56 @@
+class ReservationsController < ApplicationController
+  before_action :ensure_logged_in, only: [:new, :create, :edit, :update]
+  def new
+    @reservation = Reservation.new
+    @restaurant = Restaurant.find(params[:restaurant_id])
+  end
+
+  def create
+    @restaurant = Restaurant.find(params[:restaurant_id])
+    @reservation = Reservation.new(
+      date: params[:reservation][:date],
+      time: params[:reservation][:time],
+      party_size: params[:reservation][:party_size],
+      user_id: current_user.id,
+      restaurant: @restaurant
+    )
+
+    if @reservation.save
+      flash[:notice] = "Your reservation at #{@restaurant.name} has been made for #{@reservation.date} at #{@reservation.time.strftime("%I:%M%p")} for #{@reservation.party_size}."
+      redirect_to root_path
+    else
+      render :new
+    end
+  end
+
+  def index
+    @restaurant = Restaurant.find(params[:restaurant_id])
+    @reservations = Reservation.where(restaurant_id: @restaurant.id)
+  end
+
+  def edit
+    @reservation = User.find(params[:id])
+  end
+
+  def update
+    flash[:notice] = "Your reservation at #{@restaurant.name} has been changed and is now on #{@reservation.date} at #{@reservation.time.strftime("%I:%M%p")} for #{@reservation.party_size}."
+    @reservation = Reservation.find(params[:id])
+    @reservation.date = params[:reservation][:date]
+    @reservation.time = params[:reservation][:time]
+    @reservation.party_size = params[:reservation][:party_size]
+
+    if @reservation.save
+      redirect_to user_path
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @reservation = Reservation.find(params[:id])
+    @reservation.destroy
+    flash[:notice] = "You've successfully deleted a reservation."
+    redirect_to user_path
+  end
+
+end

app/controllers/restaurants_controller.rb

@@ -0,0 +1,64 @@
+class RestaurantsController < ApplicationController
+  before_action :ensure_logged_in, only: [:new, :create]
+  before_action :verify_owner_of_restaurant, only: [:edit, :update]
+  def new
+    @restaurant = Restaurant.new
+  end
+
+  def create
+    @restaurant = Restaurant.new(
+      name: params[:restaurant][:name],
+      opening_hour: params[:restaurant][:opening_hour],
+      closing_hour: params[:restaurant][:closing_hour],
+      max_capacity: params[:restaurant][:max_capacity],
+      user_id: current_user.id
+    )
+
+    if @restaurant.save
+      redirect_to root_path
+    else
+      flash.now[:alert] = @restaurant.errors.full_messages
+      render :new
+    end
+  end
+
+  def index
+    @restaurant = Restaurant.all
+  end
+
+  def show
+    @restaurant = Restaurant.find(params[:id])
+  end
+
+  def edit
+    @restaurant = Restaurant.find(params[:id])
+  end
+
+  def update
+    @restaurant = Restaurant.find(params[:id])
+    @restaurant.name = params[:restaurant][:name]
+    @restaurant.opening_hour = params[:restaurant][:opening_hour]
+    @restaurant.closing_hour = params[:restaurant][:closing_hour]
+    @restaurant.max_capacity = params[:restaurant][:max_capacity]
+
+    if @restaurant.save
+      redirect_to restaurant_path
+    else
+      render :edit
+    end
+  end
+
+  def verify_owner_of_restaurant
+    unless current_user.id == @restaurant.user_id
+      flash[:notice] = "You do not own this restaurant. Please login as the owner."
+      redirect_to new_session_url
+    end
+  end
+
+  def destroy
+    @restaurant = Restaurant.find(params[:id])
+    @restaurant.destroy
+    flash[:notice] = "You have successfully deleted your restaurant."
+    redirect_to restaurants_path
+  end
+end

app/controllers/sessions_controller.rb

@@ -0,0 +1,23 @@
+class SessionsController < ApplicationController
+
+  def new
+  end
+
+  def create
+    user = User.find_by(username: params[:session][:username])
+
+    if user && user.authenticate(params[:session][:password])
+      session[:user_id] = user.id
+      redirect_to root_path
+    else
+      flash.now[:notice] = "Login failed, username and/or password are incorrect"
+      render :new
+    end
+  end
+
+  def destroy
+    session[:user_id] = nil
+    redirect_to root_path
+  end
+
+end

app/controllers/users_controller.rb

@@ -0,0 +1,51 @@
+class UsersController < ApplicationController
+  before_action :user_session, only: [:edit, :show, :update]
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new(
+      username: params[:user][:username],
+      first_name: params[:user][:first_name],
+      last_name: params[:user][:last_name],
+      email: params[:user][:email],
+      password: params[:user][:password],
+      password_confirmation: params[:user][:password_confirmation]
+    )
+
+    if @user.save
+      session[:user_id] = @user.id
+      redirect_to root_path
+    else
+      flash.now[:alert] = @user.errors.full_messages
+      render :new
+    end
+  end
+  #
+  def edit
+  end
+
+  def show
+    @resos = @user.reservations
+  end
+
+  def update
+    @user.first_name = params[:user][:first_name]
+    @user.last_name = params[:user][:last_name]
+    @user.username = params[:user][:username]
+    @user.email = params[:user][:email]
+    @user.password = params[:user][:password]
+    @user.password_confirmation = params[:user][:password_confirmation]
+
+    if @user.save
+      redirect_to user_path
+    else
+      render :edit
+    end
+  end
+
+  def user_session
+    @user = User.find(session[:user_id])
+  end
+end

app/helpers/reservation_helper.rb

@@ -0,0 +1,2 @@
+module ReservationHelper
+end

app/helpers/restaurant_helper.rb

@@ -0,0 +1,2 @@
+module RestaurantHelper
+end

app/helpers/session_helper.rb

@@ -0,0 +1,2 @@
+module SessionHelper
+end

app/helpers/user_helper.rb

@@ -0,0 +1,2 @@
+module UserHelper
+end

app/models/reservation.rb

@@ -0,0 +1,14 @@
+class Reservation < ApplicationRecord
+  validates :date, :time, :party_size, presence: true
+  validates_numericality_of :party_size, :greater_than => 0
+  validate :date_cannot_be_in_the_past
+
+  def date_cannot_be_in_the_past
+    if date.present? && date.past?
+      errors.add(:date, "can't be in the past")
+    end
+  end
+
+  belongs_to :user
+  belongs_to :restaurant
+end

app/models/restaurant.rb

@@ -0,0 +1,9 @@
+class Restaurant < ApplicationRecord
+  validates :name, :opening_hour, :closing_hour, :max_capacity, presence: true
+  validates :max_capacity, numericality: { only_integer: true }
+  validates_numericality_of :max_capacity, :greater_than => 0
+
+  has_many :reservations
+  belongs_to :user
+
+end

app/models/user.rb

@@ -0,0 +1,8 @@
+class User < ApplicationRecord
+  validates :first_name, :last_name, :username, :email, :password, :password_confirmation, presence: true
+  validates :username, uniqueness: true
+
+  has_secure_password
+  has_many :reservations
+  has_many :restaurants
+end

app/views/layouts/application.html.erb

@@ -6,8 +6,26 @@
   <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
-<body>
 
+<header>
+  <nav class="navbar">
+    <%= link_to 'Restaurants', restaurants_path %> |
+    <% if current_user %>
+      <%= link_to 'Profile', user_path %> |
+      <%= link_to 'Logout', session_path("current"), :method => :delete %>
+    <% else %>
+      <%= link_to 'Login', new_session_path %> | 
+      <%= link_to 'Register', new_user_path %>
+    <% end %>
+
+  </nav>
+</header>
+<body>
+<% if flash[:notice] %>
+  <div class="notice">
+    <%= flash[:notice] %>
+  </div>
+<% end %>
 <%= yield %>
 
 </body>

app/views/reservations/_form.html.erb

@@ -0,0 +1,32 @@
+<% if reservation.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= pluralize(reservation.errors.count, "error") %> prohibited this user from being saved:</h2>
+    <ul>
+      <% reservation.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
+<%= form_for([restaurant, reservation]) do |f| %>
+
+ <div>
+   <%= f.label :date %>
+   <%= f.date_field :date %>
+ </div>
+
+  <div>
+   <%= f.label :time %>
+   <%= f.time_field :time %>
+ </div>
+
+  <div>
+   <%= f.label :party_size %>
+   <%= f.number_field :party_size %>
+ </div>
+
+  <div>
+   <%= f.submit "Save reservation" %>
+ </div>
+<% end %>

app/views/reservations/edit.html.erb

@@ -0,0 +1,3 @@
+<h1>Edit Reservation</h1>
+<%= link_to 'Back to reservation', reservation_path %>
+<%= render 'form', reservation: @reservation %>