diff --git a/Gemfile b/Gemfile index 4c9125f27f..851fc18d3f 100644 --- a/Gemfile +++ b/Gemfile @@ -58,6 +58,7 @@ group :development do # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' + gem 'pry' end diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..804b3381e6 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,242 @@ +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.7.6) + 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) + coderay (1.1.2) + 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.3) + erubi (1.9.0) + execjs (2.7.0) + ffi (1.13.0) + 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.5.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.9) + mini_portile2 (~> 2.4.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (4.0.5) + puma (3.12.6) + rack (2.2.2) + 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) + pry + 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/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7db7b8747e..f5b3974d0b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -50,3 +50,7 @@ body { height: 290px; text-align: left; } + +.field_with_errors input[type='text']{ + border: 1px solid red; +} \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..ec2ff02b11 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,19 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + helper_method :current_user + + private + + def verified_user + redirect_to root_path unless user_is_authenticated + end + + def user_is_authenticated + !!current_user + end + + 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..54be646212 --- /dev/null +++ b/app/controllers/attractions_controller.rb @@ -0,0 +1,44 @@ +class AttractionsController < ApplicationController + before_action :verified_user + + def index + @attraction = Attraction.all + end + + def show + @attraction = Attraction.find(params[:id]) + @ride = @attraction.rides.build(user_id: current_user.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(params[:id]) + end + + def update + @attraction = Attraction.find(params[:id]) + @attraction.update(attraction_params) + redirect_to attraction_path(@attraction) + end + + private + + def attraction_params + params.require(:attraction).permit( + :name, + :min_height, + :happines_rating, + :nausea_rating, + :tickets + ) + end + +end diff --git a/app/controllers/rides_controller.rb b/app/controllers/rides_controller.rb new file mode 100644 index 0000000000..1db7a98562 --- /dev/null +++ b/app/controllers/rides_controller.rb @@ -0,0 +1,15 @@ +class RidesController < ApplicationController + def create + ride = Ride.create(ride_params) + message = ride.take_ride + redirect_to user_path(ride.user), flash: { message: message } + end + + private + + def ride_params + params.require(:ride).permit(:user_id, :attraction_id) + end + + +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb new file mode 100644 index 0000000000..66d4884bb9 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,16 @@ +class SessionsController < ApplicationController + def new + end + + def create + @user = User.find_by(name: params[:user][:name]) + session[:user_id] = @user.id + redirect_to user_path(@user) + end + + def destroy + session.delete :user_id + redirect_to root_url + 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..87db28d01d --- /dev/null +++ b/app/controllers/static_controller.rb @@ -0,0 +1,4 @@ +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..d089ac51ec --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,31 @@ +class UsersController < ApplicationController + before_action :verified_user + skip_before_action :verified_user, only: [:new, :create] + + def new + @user = User.new + end + + def create + @user = User.new(user_params) + + if @user.save + session[:user_id] = @user.id + redirect_to user_path(@user) + else + render new_user_path + end + end + + def show + @user = User.find(params[:id]) + end + + + private + + def user_params + params.require(:user).permit(:name, :height, :happiness, :nausea, :tickets, :admin, :password) + end + +end diff --git a/app/models/attraction.rb b/app/models/attraction.rb index 474bd1e76c..d0e34dc721 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..a8dc78cdd4 100644 --- a/app/models/ride.rb +++ b/app/models/ride.rb @@ -1,2 +1,41 @@ +require 'pry' + class Ride < ActiveRecord::Base + belongs_to :attraction + belongs_to :user + + def take_ride + if user_has_enough_tickets && user_is_tall_enough + start_ride + elsif !user_has_enough_tickets && !user_is_tall_enough + "Sorry. You do not have enough tickets to ride the Roller Coaster. You are not tall enough to ride the #{self.attraction.name}." + elsif !user_is_tall_enough + "Sorry. You are not tall enough to ride the #{self.attraction.name}." + elsif !user_has_enough_tickets + "Sorry. You do not have enough tickets to ride the #{self.attraction.name}." + end + end + + def start_ride + new_happiness = self.user.happiness + self.attraction.happiness_rating + new_nausea = self.user.nausea + self.attraction.nausea_rating + new_tickets = self.user.tickets - self.attraction.tickets + + user.update(:happiness => new_happiness, :nausea => new_nausea, :tickets => new_tickets) + + "Thanks for riding the #{self.attraction.name}!" + end + + def user_meets_requirements + self.user_has_enough_tickets && self.user_is_tall_enough + end + + def user_has_enough_tickets + self.user.tickets >= self.attraction.tickets + end + + def user_is_tall_enough + self.user.height >= self.attraction.min_height.to_i + end + end diff --git a/app/models/user.rb b/app/models/user.rb index 4a57cf079b..24fc66f532 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,11 @@ class User < ActiveRecord::Base + has_many :rides + has_many :attractions, :through => :rides + validates :password, presence: true + + 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..d7e3a2b3b7 --- /dev/null +++ b/app/views/attractions/_form.html.erb @@ -0,0 +1,36 @@ +<%= form_for(@attraction) do |f| %> +
+<%= f.label :name %> +
+
+<%= f.text_field :name, class:"form-control" %> +
+
+<%= f.label :'Height Requirement (in inches)' %> +
+
+<%= f.number_field :min_height, class:"form-control" %> +
+
+<%= f.label :'How fun is it? (1-5 scale)' %> +
+
+<%= f.number_field :happiness_rating, class:"form-control" %> +
+
+<%= f.label :'How nausea-inducing is it? (1-5 scale)' %> +
+
+<%= f.number_field :nausea_rating, class:"form-control" %> +
+
+<%= f.label :'How many tickets does it cost?'%> +
+
+<%= f.text_field :tickets, class:"form-control" %> +
+ +
+<%= f.submit class:"btn btn-primary"%> +
+<% 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..a7892433cf --- /dev/null +++ b/app/views/attractions/edit.html.erb @@ -0,0 +1,5 @@ +

Editing attraction

+<%= render 'form' %> +<%= link_to "Show", attraction_url(@attraction) %> +| +<%= link_to "Back", attractions_url(@attraction) %> \ 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..73df7d31fd --- /dev/null +++ b/app/views/attractions/index.html.erb @@ -0,0 +1,40 @@ +

Listing attractions

+ + + + + + + + + <% @attraction.each do |attraction| %> + + + + <% if current_user.admin %> + + <% else %> + + <% end %> + + <% end %> + +
+ Name + + Tickets + + Details +
+ <%=attraction.name%> + + <%=attraction.tickets%> + <%= link_to "Show #{attraction.name}", attraction_path(attraction) %><%= link_to "Go on #{attraction.name}", attraction_path(attraction) %>
+ +<% if current_user.admin %> +

+ <%= link_to 'New Attraction', new_attraction_path %> +

+<% else %> +

<%= link_to "Back to profile", user_path(current_user), {:class => "btn btn-primary"} %>

+<% 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..ac9fad686d --- /dev/null +++ b/app/views/attractions/new.html.erb @@ -0,0 +1,3 @@ +

New Attraction

+ +<%= render '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..b3fa573401 --- /dev/null +++ b/app/views/attractions/show.html.erb @@ -0,0 +1,30 @@ +

+ Name: + <%= @attraction.name %> +

+

+ Total Number of Users: + <%= @attraction.users.count %> +

+

+ Ticket Requirement: + <%= @attraction.tickets %> +

+

+ Nausea Rating: + <%= @attraction.nausea_rating %> +

+

+ Happiness Rating: + <%= @attraction.happiness_rating %> +

+ +<% if current_user.admin %> + <%= link_to 'Edit Attraction', [:edit, @attraction] %> +<% else %> + <%= form_for(@ride) do |f| %> + <%= f.hidden_field :user_id %> + <%= f.hidden_field :attraction_id %> + <%= f.submit "Go on this ride", class:"btn brn-light" %> + <% 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..3faa2a9fca 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,6 +1,8 @@ + + RailsAmusementPark <%= csrf_meta_tags %> @@ -18,6 +20,14 @@ Home + <% if !current_user %> + Sign Up + Log In + <% end %> + <% if current_user %> + <%= link_to "Current user's profile", root_url , class:"navbar-brand" %> + <%= link_to "Log Out", logout_path , class:"navbar-brand"%> + <% end %>