diff --git a/.byebug_history b/.byebug_history new file mode 100644 index 0000000000..d0781fa3f3 --- /dev/null +++ b/.byebug_history @@ -0,0 +1,82 @@ +continue +attraction +attraction.update(attraction_params) +attraction +exit +continue +@ride.user_id +@ride +continue +@attraction +continue +exit +user_params +continue +user = User.new(user_params) +continue +user.mood +user = User.new(user_params) +user_params +continue +params +exit +logged_in? +continue +params +exit +params +continue +exit +user.authenticate(params[:password]) +user.authenticate(password: params[:password]) +params[:password] +user +exit +contiue +user.admin +user = current_user +current_user +continue +exit +@user +continue +user_path(@user) +app.user_path(@user) +user_path(@user) +@user +exit +user.tickets +continue +attraction.tickets +user.tickets +exit +user.tickets -= attraction.tickets +user.tickets - attraction.tickets +attraction.min_height +user.height +attraction.tickets +user.tickets +exit +attraction.min_height +attraction.height +user.height +exit +user.happiness +attraction.tickets +user.tickets +self.user.tickets +self.attraction.tickets +self.attraction +self +ride +ride.attraction +Attraction.find(1).tickets +Attraction.find(1) +self +exit +self.nausea > self.happiness ? "sad" : "happy" +self.happiness +self.nausea +nausea +exit +user.mood diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..2beb2d0adf --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,240 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (5.2.5) + actionpack (= 5.2.5) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) + 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.5) + activesupport (= 5.2.5) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.5) + activesupport (= 5.2.5) + globalid (>= 0.3.6) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) + arel (>= 9.0) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) + 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 (10.2.4.0) + execjs + bcrypt (3.1.16) + bindex (0.8.1) + bootsnap (1.7.4) + 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.8) + crass (1.0.6) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + diff-lcs (1.4.4) + erubi (1.10.0) + execjs (2.7.0) + ffi (1.15.0) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + jbuilder (2.11.2) + 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.9.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.1) + method_source (1.0.0) + mini_mime (1.1.0) + minitest (5.14.4) + msgpack (1.4.2) + nio4r (2.5.7) + nokogiri (1.11.3-x86_64-linux) + racc (~> 1.4) + public_suffix (4.0.6) + puma (3.12.6) + racc (1.5.2) + 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.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) + bundler (>= 1.3.0) + railties (= 5.2.5) + 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.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) + method_source + rake (>= 0.8.7) + thor (>= 0.19.0, < 2.0) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-rails (5.0.1) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.2) + 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.1) + 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.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + thor (1.1.0) + 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.9) + 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.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) + +PLATFORMS + x86_64-linux + +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.2.11 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..a5c27fe16f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,27 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + helper_method :current_user + helper_method :logged_in? + before_action :authenticated_user + + def current_user + # how do we set up the variable + # so this doesn't need to be looked up each time? + # I didn't capture it from any lessons/videos + User.find_by(id: session[:user_id]) if session[:user_id] + end + + def logged_in? + !!current_user + end + + def authenticated_user + # remember to redirect to the proper path, + # check logged in, AND ensure the proper + # proper hooks are set, in this case + # skip_before_action that I devined + # from the solution + redirect_to root_path unless logged_in? + end + end diff --git a/app/controllers/attractions_controller.rb b/app/controllers/attractions_controller.rb new file mode 100644 index 0000000000..d6222a32df --- /dev/null +++ b/app/controllers/attractions_controller.rb @@ -0,0 +1,38 @@ +class AttractionsController < ApplicationController + + def index + @attractions = 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, :happiness_rating, :nausea_rating, :tickets) + 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..af54a020a4 --- /dev/null +++ b/app/controllers/rides_controller.rb @@ -0,0 +1,23 @@ +class RidesController < ApplicationController + + def create + # I realized this is done this way because of the + # assocations of the models (a ride is comprised + # of the user and the attraction) + ride = Ride.create(ride_params) + # remember! take_ride returns a message! + message = ride.take_ride + # this was a new syntax, devined from the solution, + # but I like it and will be using it. Also, the ride + # has a user (associations, remember?!) so you can + # pass the object for Rails to determine the user_id + redirect_to user_path(ride.user), flash: {message: message} + end + + private + + def ride_params + params.require(:ride).permit(:user_id, :attraction_id) + 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..df3125f471 --- /dev/null +++ b/app/controllers/sessions_controller.rb @@ -0,0 +1,29 @@ +class SessionsController < ApplicationController + # this was devined from the solution, a hook that + # wasn't covered in a lesson/lab but makes sense! + # ensure this is set correctly to avoid an inifite loop + # although Rails helpfully tells you you have done this :D + skip_before_action :authenticated_user, only: [:new, :create] + + def new + + end + + def create + user = User.find_by(name: params[:user][:name]) + if user && user.authenticate(params[:password]) + session[:user_id] = user.id + redirect_to user_path(user) + else + redirect_to signin_path + end + end + + def destroy + # I got this method from an Avi video, it's + # pretty awesome + reset_session + redirect_to root_path + 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..462352e998 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,31 @@ +class UsersController < ApplicationController + # again, this came from solution but totally makes + # sense; just a matter of determining the vectors + # of what you are doing (ex. including vs excluding, + # doing before vs doing after) + skip_before_action :authenticated_user, only: [:new, :create] + + def new + @user = User.new + end + + def create + if user = User.create(user_params) + session[:user_id] = user.id + redirect_to user_path(user) + else + render new_user_path + end + end + + def show + @user = current_user + end + + private + + def user_params + params.require(:user).permit(:name, :height, :happiness, :nausea, :tickets, :password, :admin) + end + +end \ No newline at end of file diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb new file mode 100644 index 0000000000..5ffe59ea8b --- /dev/null +++ b/app/controllers/welcome_controller.rb @@ -0,0 +1,9 @@ +class WelcomeController < ApplicationController + skip_before_action :authenticated_user, only: [:home] + + # it looks like the solution used a static controller, + # I chose to imitate the welcome pattern + def home + + 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..d03bcb472b 100644 --- a/app/models/ride.rb +++ b/app/models/ride.rb @@ -1,2 +1,28 @@ class Ride < ActiveRecord::Base + belongs_to :user + belongs_to :attraction + + # the final message wasn't made clear until testing - argh! + # I see the solution took a more method based approach, + # which I would also consider. I took the approach of + # setting booleans values in a single method + def take_ride + has_tickets = true if user.tickets >= attraction.tickets + has_height = true if user.height >= attraction.min_height + + if !has_tickets && !has_height + "Sorry. You do not have enough tickets to ride the #{attraction.name}. You are not tall enough to ride the #{attraction.name}." + elsif !has_tickets + "Sorry. You do not have enough tickets to ride the #{attraction.name}." + elsif !has_height + "Sorry. You are not tall enough to ride the #{attraction.name}." + else + user.tickets = user.tickets - attraction.tickets + user.nausea = user.nausea + attraction.nausea_rating + user.happiness = 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..300a8e48da 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,13 @@ class User < ActiveRecord::Base + has_many :rides + has_many :attractions, through: :rides + has_secure_password + + # the unless admin didn't pop up until the admin + # portion of testing, I devined this from the solution + # as well. I keep forgetting there are cool/helpful + # things like this in Ruby! + def mood + nausea > happiness ? "sad" : "happy" unless admin + end end diff --git a/app/views/attractions/_form.html.erb b/app/views/attractions/_form.html.erb new file mode 100644 index 0000000000..fb35c0fbbb --- /dev/null +++ b/app/views/attractions/_form.html.erb @@ -0,0 +1,23 @@ +<%= form_for @attraction do |f| %> +
+ <%= f.label :name %>
+ <%= f.text_field :name %> +
+
+ <%= f.label :min_height, "Height Requirement (in inches)" %>
+ <%= f.number_field :min_height %> +
+
+ <%= f.label :happiness_rating, "How fun is it? (1-5 scale)" %>
+ <%= f.number_field :happiness_rating %> +
+
+ <%= f.label :nausea_rating, "How nausea-inducing is it? (1-5 scale)" %>
+ <%= f.number_field :nausea_rating %> +
+
+ <%= f.label :tickets, "How many tickets does it cost?" %>
+ <%= f.number_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..4f9de2d57b --- /dev/null +++ b/app/views/attractions/edit.html.erb @@ -0,0 +1,3 @@ +

Edit Attraction

+<%= render '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..c3405931fe --- /dev/null +++ b/app/views/attractions/index.html.erb @@ -0,0 +1,28 @@ + + + + + + + + + + <% @attractions.each do |attraction| %> + + + + <% if current_user.admin %> + + + <% else %> + + <% end %> + + <% end %> + +
NameTicketsDetails
<%= 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 %> +<% 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..ff134a4909 --- /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..17bc550a37 --- /dev/null +++ b/app/views/attractions/show.html.erb @@ -0,0 +1,16 @@ +Name: <%= @attraction.name %>
+Total Number of Users: <%= @attraction.users.count %>
+Ticket Requirement: <%= @attraction.tickets %>
+Height Requirement: <%= @attraction.min_height %>
+Nausea Rating: <%= @attraction.nausea_rating %>
+Happiness Rating: <%= @attraction.happiness_rating %>
+ +<% unless current_user.admin %> + <%= form_for @ride do |f| %> + <%= f.hidden_field :user_id %> + <%= f.hidden_field :attraction_id %> + <%= f.submit "Go on this ride" %> + <% end %> +<% else %> + <%= link_to "Edit Attraction", edit_attraction_path %> +<% 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..89b4d9b0de 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,6 +18,14 @@ Home + + <% if !logged_in? %> + Sign Up + Log In + <% else %> + <%= current_user.name %>'s Profile + Log Out + <% end %>