diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000000..0d659cbb24 --- /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.6.1) + execjs + bcrypt (3.1.15) + bindex (0.8.1) + bootsnap (1.4.7) + 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.5) + 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.3) + 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..db763c8ae4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,20 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + protect_from_forgery with: :exception + before_action :verified_user + helper_method :current_user + + private + + def verified_user + redirect_to '/' 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..2f05e51138 --- /dev/null +++ b/app/controllers/attractions_controller.rb @@ -0,0 +1,41 @@ +class AttractionsController < ApplicationController + def index + @attractions = Attraction.all + end + + def show + @attraction = Attraction.find_by(id: 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_by(id: params[:id]) + @ride = @attraction.rides.build(user_id: current_user.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, + :tickets, + :happiness_rating, + :nausea_ratiing + ) + 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..0be133b3d3 --- /dev/null +++ b/app/controllers/rides_controller.rb @@ -0,0 +1,16 @@ +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 \ No newline at end of file diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb new file mode 100644 index 0000000000..caa2b808a4 --- /dev/null +++ b/app/controllers/session_controller.rb @@ -0,0 +1,21 @@ +class SessionController < ApplicationController + skip_before_action :verified_user, only: [:new, :create] + + 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 root_path + 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..ecba18129e --- /dev/null +++ b/app/controllers/static_controller.rb @@ -0,0 +1,6 @@ + class StaticController < ApplicationController + skip_before_action :verified_user, only: [:home] + + 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..4e5377038c --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,34 @@ +class UsersController < ApplicationController + skip_before_action :verified_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' + end + end + + def show + @user = User.find_by(id: params[:id]) + end + + private + + def user_params + params.require(:user).permit( + :name, + :height, + :nausea, + :tickets, + :admin, + :password, + :happiness + ) + end + end \ No newline at end of file diff --git a/app/models/attraction.rb b/app/models/attraction.rb index 474bd1e76c..337646b752 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..ef77b8bf36 100644 --- a/app/models/ride.rb +++ b/app/models/ride.rb @@ -1,2 +1,48 @@ class Ride < ActiveRecord::Base + belongs_to :user + belongs_to :attraction + + def take_ride + user_has_enough_tickets, user_is_tall_enough = user_meets_requirements + if user_has_enough_tickets && user_is_tall_enough + start_ride + elsif user_is_tall_enough && !user_has_enough_tickets + "Sorry. " + not_enough_tickets + elsif !user_is_tall_enough && user_has_enough_tickets + "Sorry. " + not_tall_enough + elsif !user_is_tall_enough && !user_has_enough_tickets + "Sorry. " + not_enough_tickets + " " + not_tall_enough + end + end + + def user_meets_requirements + user_has_enough_tickets, user_is_tall_enough = false + if self.user.tickets >= self.attraction.tickets + user_has_enough_tickets = true + end + if self.user.height >= self.attraction.min_height + user_is_tall_enough = true + end + return [user_has_enough_tickets, user_is_tall_enough] + end + + def start_ride + new_happiness = self.user.happiness + self.attraction.happiness_rating + new_nausea = self.user.nausea + self.attraction.nausea_rating + new_ticket_count = self.user.tickets - self.attraction.tickets + self.user.update( + :happiness => new_happiness, + :nausea => new_nausea, + :tickets => new_ticket_count + ) + "Thanks for riding the #{self.attraction.name}!" + end + + def not_enough_tickets + "You do not have enough tickets to ride the #{self.attraction.name}." + end + + def not_tall_enough + "You are not tall enough to ride the #{self.attraction.name}." + end end diff --git a/app/models/user.rb b/app/models/user.rb index 4a57cf079b..19b03e16cf 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,2 +1,11 @@ class User < ActiveRecord::Base + has_secure_password + has_many :rides + has_many :attractions, :through => :rides + + def mood + unless admin + happiness > 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..adcac58b73 --- /dev/null +++ b/app/views/attractions/_form.html.erb @@ -0,0 +1,26 @@ + +<%= form_for(@attraction) do |f| %> +
+ <%= f.label :name %>
+ <%= f.text_field :name, class: "form-control" %>
+ +
+ <%= f.label :min_height, "Height Requirement (in inches)" %>
+ <%= f.number_field :min_height, class: "form-control" %>
+ +
+ <%= f.label :happiness_rating, "How fun is it? (1-5 scale)" %>
+ <%= f.number_field :happiness_rating, class: "form-control" %>
+ +
+ <%= f.label :nausea_rating, "How nausea-inducing is it? (1-5 scale)" %>
+ <%= f.number_field :nausea_rating, class: "form-control" %>
+ +
+ <%= f.label :tickets, "How many tickets does it cost?" %>
+ <%= f.number_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..2fb3b9bf61 --- /dev/null +++ b/app/views/attractions/edit.html.erb @@ -0,0 +1,6 @@ +

Editing attraction

+ +<%= render 'form' %> + +<%= link_to 'Show', @attraction %> | +<%= link_to 'Back', attractions_path %> \ 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..b8fd90bf13 --- /dev/null +++ b/app/views/attractions/index.html.erb @@ -0,0 +1,38 @@ +

Listing attractions

+ + + + + + + + + + + + + + + <% @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 @user %> +

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

+<% else %> +

<%= 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..4e2b55cf47 --- /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..3edfd32fe4 --- /dev/null +++ b/app/views/attractions/show.html.erb @@ -0,0 +1,23 @@ +

<%= notice %>

+ +
+ +
+

Name: <%= @attraction.name %>

+

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

+

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

+

Height Requirement: <%= @attraction.min_height %> inches

+

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 btn-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..fc867b081a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,10 +18,18 @@ Home + <% if !current_user %> + Sign Up + <%= link_to "Log in", signin_path, class:"navbar-brand" %> + <% end %> + <% if current_user %> + <%= link_to "#{current_user.name}'s profile", user_path(current_user), class:"navbar-brand"%> + <%= link_to "Log Out", session_path, class:"navbar-brand",method:'delete' %> + <% end %> @@ -32,4 +40,4 @@ <%= yield %> - + \ No newline at end of file diff --git a/app/views/session/new.html.erb b/app/views/session/new.html.erb new file mode 100644 index 0000000000..ab9622c937 --- /dev/null +++ b/app/views/session/new.html.erb @@ -0,0 +1,18 @@ +<%= form_tag('/session', method: :post) do %> + +
+ <%= label_tag(:name, "Your name:") %> + + <%= collection_select(:user, :name, User.all, :name, :name, prompt: "Please select your username from this dropdown") %> +
+ +
+ <%= label_tag(:password, "Your password:") %> + <%= password_field_tag(:password, nil, class: "form-control") %> +
+ +
+ <%= submit_tag("Sign In") %> +
+ + <% end %> \ No newline at end of file diff --git a/app/views/static/home.html.erb b/app/views/static/home.html.erb new file mode 100644 index 0000000000..dfbab7e9a9 --- /dev/null +++ b/app/views/static/home.html.erb @@ -0,0 +1,6 @@ +
+
+ +
+

Welcome to the //Amusement Park!

+
\ No newline at end of file diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb new file mode 100644 index 0000000000..af3c859917 --- /dev/null +++ b/app/views/users/_form.html.erb @@ -0,0 +1,61 @@ +<%= form_for @user do |f| %> + <% if @user.errors.any? %> +
+

+ <%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved: +

+ + +
+ <% end %> + +
+ <%= f.label :name %> +
+ <%= f.text_field :name, class: "form-control" %> +
+ +
+ <%= f.label :height, "Height (in inches)" %> +
+ <%= f.number_field :height, class: "form-control" %> +
+ +
+ <%= f.label :happiness, "How happy are you? (1-5 scale)" %> +
+ <%= f.number_field :happiness, class: "form-control" %> +
+ +
+ <%= f.label :nausea, "How nauseous are you? (1-5 scale)" %> +
+ <%= f.number_field :nausea, class: "form-control" %> +
+ +
+ <%= f.label :tickets, "How many dollars are in your pocket?" %> +
+ <%= f.number_field :tickets, class: "form-control" %> +
+ +
+ <%= f.label :admin, "Check box if you are a theme park owner" %> + <%= f.check_box :admin, class: "form-check-input" %> +
+ +
+ <%= f.label :password %> +
+ <%= f.password_field :password, class: "form-control" %> + +
+
+ <%= f.submit class: "btn btn-primary" %> +
+ + <% end %> \ No newline at end of file diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb new file mode 100644 index 0000000000..efa13e7c34 --- /dev/null +++ b/app/views/users/new.html.erb @@ -0,0 +1 @@ +<%= render 'form' %> \ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000..1f7b554656 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,23 @@ +

<%= notice %>

+ + + +<% if flash[:message] %> +
+

<%= flash[:message] %>

+
+<% end %> + +
+ +
+ <% if @user.admin %> +

ADMIN

+ <% end %> +

Name: <%= @user.name %>

+

Tickets: <%= @user.tickets %>

+

Mood: <%= @user.mood %>

+

Height: <%= @user.height %> inches

+

<%= link_to 'See attractions', attractions_path %>

+
+
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 787824f888..d85a52e269 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,19 @@ Rails.application.routes.draw do # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + get '/users/new', to: 'users#new', as: 'new_user' + root 'static#home' + get '/users', to:'users#index', as: 'users' + post '/users', to:'users#create' + get '/users/:id', to: 'users#show', as: 'user' + get '/users/:id/edit', to: 'users#edit', as: 'edit_user' + get '/attractions', to: 'attractions#index', as: 'attractions' + get '/signin', to: 'session#new', as: 'signin' + post '/session', to: 'session#create', as: 'session' + delete '/session/', to: 'session#destroy' + get '/attractions/new', to: 'attractions#new', as: 'new_attraction' + get '/attractions/:id', to: 'attractions#show', as: 'attraction' + get '/attractions/:id/edit', to: 'attractions#edit', as: 'edit_attraction' + patch '/attractions/:id', to: 'attractions#update' + post '/attractions', to: 'attractions#create' + post '/rides', to:"rides#create", as: 'rides' end diff --git a/db/migrate/01_create_users.rb b/db/migrate/01_create_users.rb new file mode 100644 index 0000000000..26c3eb846a --- /dev/null +++ b/db/migrate/01_create_users.rb @@ -0,0 +1,15 @@ +class CreateUsers < ActiveRecord::Migration[5.2] + def change + create_table :users do |t| + t.string :name + t.integer :height + t.integer :happiness + t.integer :nausea + t.integer :tickets + t.boolean :admin + t.string :password_digest + + t.timestamps null: false + end + end +end diff --git a/db/migrate/02_create_attractions.rb b/db/migrate/02_create_attractions.rb new file mode 100644 index 0000000000..27fbd3fa30 --- /dev/null +++ b/db/migrate/02_create_attractions.rb @@ -0,0 +1,13 @@ +class CreateAttractions < ActiveRecord::Migration[5.2] + def change + create_table :attractions do |t| + t.string :name + t.integer :min_height + t.integer :happiness_rating + t.integer :nausea_rating + t.integer :tickets + + t.timestamps null: false + end + end +end diff --git a/db/migrate/03_create_rides.rb b/db/migrate/03_create_rides.rb new file mode 100644 index 0000000000..5c77f1dc14 --- /dev/null +++ b/db/migrate/03_create_rides.rb @@ -0,0 +1,10 @@ +class CreateRides < ActiveRecord::Migration[5.2] + def change + create_table :rides do |t| + t.integer :user_id + t.integer :attraction_id + + t.timestamps null: false + end + end +end diff --git a/db/migrate/04_change_column.rb b/db/migrate/04_change_column.rb new file mode 100644 index 0000000000..6369348aa2 --- /dev/null +++ b/db/migrate/04_change_column.rb @@ -0,0 +1,5 @@ +class ChangeColumn < ActiveRecord::Migration[5.2] + def change + change_column :users, :admin, :boolean, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..344124ab24 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,44 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 4) do + + create_table "attractions", force: :cascade do |t| + t.string "name" + t.integer "min_height" + t.integer "happiness_rating" + t.integer "nausea_rating" + t.integer "tickets" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "rides", force: :cascade do |t| + t.integer "user_id" + t.integer "attraction_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "users", force: :cascade do |t| + t.string "name" + t.integer "height" + t.integer "happiness" + t.integer "nausea" + t.integer "tickets" + t.boolean "admin", default: false + t.string "password_digest" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + +end diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000000..06c57fadb0 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,4 @@ +{ + "name": "rails-amusement-park", + "lockfileVersion": 1 +}