From f530ef40e3ca3824b41a68a93354758a3df4ec5d Mon Sep 17 00:00:00 2001 From: Mitchell Beebe Date: Thu, 16 Jul 2020 14:16:14 -0400 Subject: [PATCH] Done. --- Gemfile.lock | 237 ++++++++++++++++++ app/controllers/application_controller.rb | 7 + app/controllers/attractions_controller.rb | 46 ++++ app/controllers/rides_controller.rb | 13 + app/controllers/sessions_controller.rb | 22 ++ app/controllers/static_controller.rb | 6 + app/controllers/users_controller.rb | 41 +++ app/models/attraction.rb | 2 + app/models/ride.rb | 24 +- app/models/user.rb | 11 +- app/views/attractions/_form.html.erb | 20 ++ app/views/attractions/edit.html.erb | 3 + app/views/attractions/index.html.erb | 24 ++ app/views/attractions/new.html.erb | 3 + app/views/attractions/show.html.erb | 17 ++ app/views/layouts/application.html.erb | 12 +- app/views/sessions/new.html.erb | 11 + app/views/static/home.html.erb | 6 + app/views/users/new.html.erb | 24 ++ app/views/users/show.html.erb | 18 ++ config/routes.rb | 10 + .../20200707211111_create_attractions.rb | 13 + db/migrate/20200707211208_create_users.rb | 15 ++ db/migrate/20200707211339_create_rides.rb | 10 + db/schema.rb | 46 ++++ 25 files changed, 638 insertions(+), 3 deletions(-) create mode 100644 Gemfile.lock create mode 100644 app/controllers/attractions_controller.rb create mode 100644 app/controllers/rides_controller.rb create mode 100644 app/controllers/sessions_controller.rb create mode 100644 app/controllers/static_controller.rb create mode 100644 app/controllers/users_controller.rb create mode 100644 app/views/attractions/_form.html.erb create mode 100644 app/views/attractions/edit.html.erb create mode 100644 app/views/attractions/index.html.erb create mode 100644 app/views/attractions/new.html.erb create mode 100644 app/views/attractions/show.html.erb create mode 100644 app/views/sessions/new.html.erb create mode 100644 app/views/static/home.html.erb create mode 100644 app/views/users/new.html.erb create mode 100644 app/views/users/show.html.erb create mode 100644 db/migrate/20200707211111_create_attractions.rb create mode 100644 db/migrate/20200707211208_create_users.rb create mode 100644 db/migrate/20200707211339_create_rides.rb create mode 100644 db/schema.rb diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..1637643742 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,237 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.4.3) + actionpack (= 5.2.4.3) + 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) + 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) + 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) + 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) + 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) + arel (>= 9.0) + activestorage (5.2.4.3) + actionpack (= 5.2.4.3) + activerecord (= 5.2.4.3) + marcel (~> 0.3.1) + activesupport (5.2.4.3) + 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) + autoprefixer-rails (9.8.4) + execjs + bcrypt (3.1.13) + bindex (0.8.1) + bootsnap (1.4.6) + msgpack (~> 1.0) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + builder (3.2.4) + byebug (11.1.3) + capybara (2.18.0) + addressable + mini_mime (>= 0.1.3) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (>= 2.0, < 4.0) + childprocess (3.0.0) + coffee-rails (4.2.2) + coffee-script (>= 2.2.0) + railties (>= 4.0.0) + coffee-script (2.4.1) + coffee-script-source + execjs + coffee-script-source (1.12.2) + concurrent-ruby (1.1.6) + crass (1.0.6) + database_cleaner (1.8.5) + diff-lcs (1.4.4) + erubi (1.9.0) + execjs (2.7.0) + ffi (1.13.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.8.3) + concurrent-ruby (~> 1.0) + jbuilder (2.10.0) + activesupport (>= 5.0.0) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.6.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + msgpack (1.3.3) + nio4r (2.5.2) + nokogiri (1.10.10) + mini_portile2 (~> 2.4.0) + public_suffix (4.0.5) + puma (3.12.6) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rack_session_access (0.2.0) + builder (>= 2.0.0) + rack (>= 1.0.0) + 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) + bundler (>= 1.3.0) + railties (= 5.2.4.3) + 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) + 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) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-rails (4.0.1) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.9) + rspec-expectations (~> 3.9) + rspec-mocks (~> 3.9) + rspec-support (~> 3.9) + rspec-support (3.9.3) + ruby_dep (1.5.0) + rubyzip (2.3.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.1.0) + railties (>= 5.2.0) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + spring (2.1.0) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + thor (1.0.1) + thread_safe (0.3.6) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.7) + thread_safe (~> 0.1) + uglifier (4.2.0) + execjs (>= 0.3.0, < 3) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.7.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + ruby + +DEPENDENCIES + bcrypt (~> 3.1.7) + bootsnap + bootstrap-sass (= 3.3.7) + byebug + capybara (~> 2.13) + coffee-rails (~> 4.2) + database_cleaner + jbuilder (~> 2.5) + listen (>= 3.0.5, < 3.2) + puma (~> 3.7) + rack_session_access + rails (~> 5.1) + rspec-rails + sass-rails (~> 5.0) + selenium-webdriver + spring + spring-watcher-listen (~> 2.0.0) + sqlite3 (~> 1.3.6) + turbolinks (~> 5) + tzinfo-data + uglifier (>= 1.3.0) + web-console (>= 3.3.0) + +BUNDLED WITH + 2.1.4 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..ab3a3ae169 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,10 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + helper_method :current_user + + private + + def current_user + User.find_by(id: session[:user_id]) + end end diff --git a/app/controllers/attractions_controller.rb b/app/controllers/attractions_controller.rb new file mode 100644 index 0000000000..4b89d12ebd --- /dev/null +++ b/app/controllers/attractions_controller.rb @@ -0,0 +1,46 @@ +class AttractionsController < ApplicationController + before_action :set_attraction + skip_before_action :set_attraction, only: [:index, :new, :create] + def index + @attractions = Attraction.all + end + + def show + # @attraction = Attraction.find_by(id: params[:id]) + end + + def new + @attraction = Attraction.new + end + + def create + @attraction = Attraction.create(attraction_params) + redirect_to attraction_path(@attraction) + end + + def edit + # @attraction = Attraction.find_by(id: params[:id]) + end + + def update + # @attraction = Attraction.find_by(id: params[:id]) + @attraction.update(attraction_params) + redirect_to attraction_path(@attraction) + end + + private + + def attraction_params + params.require(:attraction).permit( + :name, + :min_height, + :nausea_rating, + :tickets, + :happiness_rating + ) + end + + def set_attraction + @attraction = Attraction.find_by(id: params[:id]) + end +end \ No newline at end of file diff --git a/app/controllers/rides_controller.rb b/app/controllers/rides_controller.rb new file mode 100644 index 0000000000..ba8d92a94a --- /dev/null +++ b/app/controllers/rides_controller.rb @@ -0,0 +1,13 @@ +class RidesController < ApplicationController + + def new + @ride = Ride.new + end + + def create + ride = Ride.create(user_id: params[:user_id], attraction_id: params[:attraction_id]) + msg = ride.take_ride + redirect_to user_path(ride.user), flash: { message: msg } + end + +end \ No newline at end of file diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..943882fd8f --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,22 @@ +class SessionsController < ApplicationController + + def new + @user = User.new + end + + def create + if @user = User.find_by(name: params[:user][:name]) + session[:user_id] = @user.id + redirect_to user_path(@user) + else + render 'new' + end + end + + def destroy + session.delete(:user_id) + redirect_to "/" + end + + +end \ No newline at end of file diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb new file mode 100644 index 0000000000..c1fef843cb --- /dev/null +++ b/app/controllers/static_controller.rb @@ -0,0 +1,6 @@ +class StaticController < ApplicationController + + def home + end + +end \ No newline at end of file diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000..8c60f9269f --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,41 @@ +class UsersController < ApplicationController + before_action :require_login + skip_before_action :require_login, only: [:new, :create] + + def new + @user = User.new + end + + def create + @user = User.create(user_params) + if @user.save + session[:user_id] = @user.id + redirect_to user_path(@user) + else + render 'new' + end + end + + def show + @user = current_user + # @user = User.find_by(id: params[:id]) + end + + private + + def user_params + params.require(:user).permit( + :name, + :height, + :nausea, + :tickets, + :admin, + :password, + :happiness + ) + end + + def require_login + redirect_to "/" unless session.include? :user_id + end +end \ No newline at end of file diff --git a/app/models/attraction.rb b/app/models/attraction.rb index 474bd1e76c..0e7dd82af3 100644 --- a/app/models/attraction.rb +++ b/app/models/attraction.rb @@ -1,2 +1,4 @@ class Attraction < ApplicationRecord + has_many :rides + has_many :users, through: :rides end diff --git a/app/models/ride.rb b/app/models/ride.rb index 4d880172e1..8a177a21cc 100644 --- a/app/models/ride.rb +++ b/app/models/ride.rb @@ -1,2 +1,24 @@ -class Ride < ActiveRecord::Base +class Ride < ApplicationRecord + belongs_to :user + belongs_to :attraction + + def take_ride + user = self.user + attraction = self.attraction + + if user.height < attraction.min_height && user.tickets < attraction.tickets + "Sorry. You do not have enough tickets to ride the #{attraction.name}. You are not tall enough to ride the #{attraction.name}." + elsif user.height < attraction.min_height + "Sorry. You are not tall enough to ride the #{attraction.name}." + elsif user.tickets < attraction.tickets + "Sorry. You do not have enough tickets to ride the #{attraction.name}." + else + user.tickets -= attraction.tickets + user.nausea += attraction.nausea_rating + user.happiness += attraction.happiness_rating + user.save + "Thanks for riding the #{attraction.name}!" + end + end + end diff --git a/app/models/user.rb b/app/models/user.rb index 4a57cf079b..ef9db659b7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,11 @@ -class User < ActiveRecord::Base +class User < ApplicationRecord + has_many :rides + has_many :attractions, through: :rides + has_secure_password + + def mood + unless admin + self.happiness >= self.nausea ? 'happy' : 'sad' + end + end end diff --git a/app/views/attractions/_form.html.erb b/app/views/attractions/_form.html.erb new file mode 100644 index 0000000000..401c0e5ce6 --- /dev/null +++ b/app/views/attractions/_form.html.erb @@ -0,0 +1,20 @@ +<%= form_for @attraction do |f| %> + + +<%= f.text_field :name %> + + +<%= f.text_field :min_height %> + + +<%= f.text_field :happiness_rating %> + + +<%= f.text_field :nausea_rating %> + + +<%= f.text_field :tickets %> + +<%= f.submit %> + +<% end %> \ No newline at end of file diff --git a/app/views/attractions/edit.html.erb b/app/views/attractions/edit.html.erb new file mode 100644 index 0000000000..4231a40064 --- /dev/null +++ b/app/views/attractions/edit.html.erb @@ -0,0 +1,3 @@ +
+<%= render partial: "form" %> +
\ No newline at end of file diff --git a/app/views/attractions/index.html.erb b/app/views/attractions/index.html.erb new file mode 100644 index 0000000000..e2350f5251 --- /dev/null +++ b/app/views/attractions/index.html.erb @@ -0,0 +1,24 @@ +

Listing Attractions

+ + + + + + + + <% @attractions.each do |a| %> + + + + <% if current_user.admin %> + + <% else %> + + <% end %> + + <% end %> +
NameTicketsDetails
<%= a.name %><%= a.tickets %><%= link_to "Show " + a.name, attraction_path(a) %><%= link_to "Go on " + a.name, attraction_path(a) %>
+ +<% if current_user.admin %> + <%= link_to "New Attraction", new_attraction_path %> +<% end %> \ No newline at end of file diff --git a/app/views/attractions/new.html.erb b/app/views/attractions/new.html.erb new file mode 100644 index 0000000000..e8fa169923 --- /dev/null +++ b/app/views/attractions/new.html.erb @@ -0,0 +1,3 @@ +
+<%= render partial: "form"%> +
\ No newline at end of file diff --git a/app/views/attractions/show.html.erb b/app/views/attractions/show.html.erb new file mode 100644 index 0000000000..a1ddd8ad7c --- /dev/null +++ b/app/views/attractions/show.html.erb @@ -0,0 +1,17 @@ +
+ +

Name: <%= @attraction.name %>

+ + + <% if current_user.admin %> + <%= link_to "Edit Attraction", edit_attraction_path %> + <% else %> + <%= form_with(url: "/rides", method: "post") do |f| %> + <%= f.hidden_field :user_id, :value => current_user.id %> + <%= f.hidden_field :attraction_id, :value => @attraction.id %> + + <%= f.submit "Go on this ride" %> + <% end %> + <% end %> + +
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d5e06ee11b..b4cafa1000 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,7 +17,17 @@ - Home + Home + <% if !current_user %> + Sign Up + <% else %> + Profile + <% end %> + <% if !current_user %> + Log In + <% else %> + Log Out + <% end %>