SO LET'S RIDE!
+
+ Ready to ride? We've got you covered.
+ Whether you're exploring for the weekend or commuting daily,
+ we've got the perfect ride to fit your needs!
+
VALET BIKE.
+
+ %>)
+
+
+
+
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
new file mode 100644
index 000000000..6239842fc
--- /dev/null
+++ b/app/views/devise/sessions/new.html.erb
@@ -0,0 +1,37 @@
+
+<%= render "devise/shared/links" %>
+
+
+ SIGN UP & RIDE!
+
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+
+
+ <%= f.label "First Name" %>
+
+
+ +
+ <%= f.text_field :firstName, autofocus: true %>
+
+
+ <%= f.label "Last Name" %>
+
++
+ <%= f.text_field :lastName, autofocus: true %>
+
+
+
+ <%= f.label :email %>
+
+
+ +
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+
+
+ <%= f.label :password %>
+ <% if @minimum_password_length %>
+ (<%= @minimum_password_length %> characters minimum)
+ <% end %>
+
+
+
+ +
+ <%= f.password_field :password, autocomplete: "new-password" %>
+
+
+ <%= f.label :password_confirmation %>
+
+
+
+<% end %>
++
+ <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+
+
+
+
+ <%= image_tag "login-image.jpg", alt: "Person on a bike" %>
+
+
+
+
+
+<% end %> + + + + + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
+ <% end %> +<% end %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 000000000..ffc34de8d --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +ValetBike
+
+
-
Welcome!
+Sign in to your account
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
+ <%= f.email_field :email, placeholder: "hello@valetbike.com", autofocus: true, autocomplete: "email", class: "input-field" %>
+
+
+
+ <%= f.password_field :password, placeholder: "Password", autocomplete: "current-password", class: "input-field" %>
+
+
+
+ <%= f.submit "Login", class: "loginpage-button" %>
+
+
+ <% if devise_mapping.rememberable? %>
+
+ <% end %>
+
+
+<% end %>
+
+<%= render "devise/shared/links" %>
+
+
+
+
diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb
new file mode 100644
index 000000000..cabfe307e
--- /dev/null
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+
+
+<% end %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb
new file mode 100644
index 000000000..cc7e4c8e9
--- /dev/null
+++ b/app/views/devise/shared/_links.html.erb
@@ -0,0 +1,29 @@
+<%- if controller_name != 'sessions' %>
+ <%= link_to "Log in", new_session_path(resource_name) %>+ <%= I18n.t("errors.messages.not_saved", + count: resource.errors.count, + resource: resource.class.model_name.human.downcase) + %> +
+-
+ <% resource.errors.full_messages.each do |message| %>
+
- <%= message %> + <% end %> +
+<% end %> + + + + + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end %> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
+ <% end %> +<% end %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 000000000..ffc34de8d --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +
Resend unlock instructions
+ +<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+
+ + <%= f.email_field :email, autofocus: true, autocomplete: "email" %> +
+ <%= f.submit "Resend unlock instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
new file mode 100644
index 000000000..b82671ef7
--- /dev/null
+++ b/app/views/home/index.html.erb
@@ -0,0 +1,8 @@
+<% if user_signed_in? %>
+ Welcome <%= current_user.email %>
+ <%= button_to "Sign out", destroy_user_session_path, method: :delete %>
+<% else %>
+ <%= button_to "Sign in", new_user_session_path %>
+<% end %>
+Welcome to ValetBikee!
+ diff --git a/app/views/home/main.html.erb b/app/views/home/main.html.erb new file mode 100644 index 000000000..f45642e0d --- /dev/null +++ b/app/views/home/main.html.erb @@ -0,0 +1,220 @@ +
+
+
diff --git a/app/views/home/stripe_payment.html.erb b/app/views/home/stripe_payment.html.erb
new file mode 100644
index 000000000..735ecddfb
--- /dev/null
+++ b/app/views/home/stripe_payment.html.erb
@@ -0,0 +1,42 @@
+<%= form_with url: payments_url do |f| %>
+
+
+
+
+<% if user_signed_in? %>
+
+
+
+
+
+
+
+ <% else %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FIND A STATION NEAR YOU
+
+
+
+
+
+ <% if params[:location].present? && @stations.present? %>
+ Nearby Stations
+-
+ <% @stations.each do |station| %>
+
-
+ <%= station.name %>
+ Address: <%= station.address %>
+ Distance: <%= station.distance_to(params[:location]).round(2) %> km +
+ <% end %>
+
No nearby stations found.
+ <% end %> +
+
+
+
+
+
+
+
+
+
+
+ VALET BIKE.
+ +
+
+
+
+  %>)
+
+
+
+
+
+
+
+ <% end %>
+
+
+
+
+ Join Us in What Matters Most: Our Community, Our Environment, and YOU.
+
+  %>)
+
+
+ Hop on and join our mission to build stronger communities, protect the environment, and help riders make a positive impact with every trip.
+ Together, we can make every journey count!
+
+
+ How to Ride 101
+
+
+
+ <%= image_tag "icon-join.jpg", alt: "Join Icon", class: "step-icon" %>
+
+ JOIN
+Download the app or visit the website to sign up.
+ Choose a membership or pay-as-you-go plan.
+ Verify your details and activate your account.
+ <%= image_tag "icon-rent.jpg", alt: "Rent Icon", class: "step-icon" %>
+
+ RENT
+Unlock your bike with the app.
Give the bike a quick inspection to ensure it is ready to ride.
Take a moment to read through bike safety guidelines before you start your journey.
+ <%= image_tag "icon-ride.jpg", alt: "Ride Icon", class: "step-icon" %>
+
+ RIDE
+Enjoy the Ride!
Make the most of your trip by keeping it within the allowed time limit to avoid any extra fees.
+ Remember: The timer continues running even when you stop, so plan accordingly!
+
+ <%= image_tag "icon-park.JPG", alt: "Park Icon", class: "step-icon" %>
+
+ PARK
+End your trip by parking at a designated hub.
+ Confirm the bike is securely parked in the app to complete your ride.
+
+
+
+
+
+
+
+ Frequenly Asked Questions
+ +
+
+
+
+
+
+
+
+
+ It’s the fastest, most affordable, and eco-friendly way to get around. Skip the traffic, save money, stay active, and help create a greener future—all with just one ride.
+
+
+
+
+ Valet Bike offers various pricing options to suit your needs, including pay-per-ride and monthly or annual memberships.
+ Pay-per-ride rates start at $2.50 for the first 30 minutes. Additional charges apply for extended rides.
+
+
+
+
+
+ Properly ending your trip helps maintain the system's efficiency and prevents additional charges.
+ Park at a Designated Hub: Locate and return the bike to an official Valet Bike station.
+ Secure the Bike: Wrap the tether around the bike rack and insert it into the closed wheel lock to ensure it's properly locked.
+ End the Trip in the App: Follow the app's instructions to finalize your trip. This may include taking a photo to confirm the bike is correctly secured.
+
+ Credit Card
+ enter your card details
+
+
+
+
+
+
+ <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7ace1393e..b5b7f262c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,22 +1,98 @@
-
-
+
+
-
+
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
+
<%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+ <%= stylesheet_link_tag "custom", media: "all", "data-turbo-track": "reload" %>
<%= javascript_importmap_tags %>
-
-
+
+
+
+
+ <%= f.number_field :amount, class: 'form-control', id: 'amount', min: 0, placeholder: 'Enter your amount in $' %>
+
+
+
+
+ <%= f.text_field :card_number, class: 'form-control', id: 'cardNumber', placeholder: '0000 0000 0000 0000' %>
+
+
+
+
+ <%= f.text_field :month, class: 'form-control', id: 'ccmonth', placeholder: 'MM' %>
+
+
+
+
+ <%= f.text_field :year, class: 'form-control', id: 'ccyear', placeholder: 'YY' %>
+
+
+
+
+ <%= f.text_field :cvc, class: 'form-control', id: 'cvv', placeholder: '123' %>
+
+
-
- <%= yield %>
+ <% if user_signed_in? %>
+
+
+ <%= image_tag("bikeLogo.png", alt: "Logo", class: "logo") %>
+ VALETBIKE
+
+ <% end %>
+
+
+
+ <%= yield %>
+
+ <% if user_signed_in? %>
+
+
+ <% end %>
+
diff --git a/app/views/map_test/_map_search.html.erb b/app/views/map_test/_map_search.html.erb
new file mode 100644
index 000000000..e6f4f6b96
--- /dev/null
+++ b/app/views/map_test/_map_search.html.erb
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/map_test/index.html.erb b/app/views/map_test/index.html.erb
new file mode 100644
index 000000000..994db743d
--- /dev/null
+++ b/app/views/map_test/index.html.erb
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+ Welcome
+
+
+ Find a Station Near You
+
+
+
+
+
+ <% if params[:location].present? && @stations.present? %>
+ Nearby Stations
+-
+ <% @stations.each do |station| %>
+
-
+ <%= station.name %>
+ Address: <%= station.address %>
+ Distance: <%= station.distance_to(params[:location]).round(2) %> km +
+ <% end %>
+
No nearby stations found.
+ <% end %> +
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/payments/cancel.html.erb b/app/views/payments/cancel.html.erb
new file mode 100644
index 000000000..0aba6764f
--- /dev/null
+++ b/app/views/payments/cancel.html.erb
@@ -0,0 +1 @@
+
+
+
+
+
+
+
+
+
+
+ Stations Near You
+
+
+
+
+
+ <% if params[:location].present? && @stations.present? %>
+ Nearby Stations
+-
+ <% @stations.each do |station| %>
+
-
+ <%= station.name %>
+ Address: <%= station.address %>
+ Distance: <%= station.distance_to(params[:location]).round(2) %> km +
+ <% end %>
+
No nearby stations found.
+ <% end %> +CANCEL
\ No newline at end of file diff --git a/app/views/payments/edit.html.erb b/app/views/payments/edit.html.erb new file mode 100644 index 000000000..aeef7dd69 --- /dev/null +++ b/app/views/payments/edit.html.erb @@ -0,0 +1,4 @@ +
+
diff --git a/app/views/payments/new.html.erb b/app/views/payments/new.html.erb
new file mode 100644
index 000000000..e9eea91ef
--- /dev/null
+++ b/app/views/payments/new.html.erb
@@ -0,0 +1,14 @@
+Payments#edit
+Find me in app/views/payments/edit.html.erb
+
+
+
diff --git a/app/views/payments/success.html.erb b/app/views/payments/success.html.erb
new file mode 100644
index 000000000..f05bae253
--- /dev/null
+++ b/app/views/payments/success.html.erb
@@ -0,0 +1,9 @@
+
+
+
+
+ TRIP COST
+
+
+
+ $<%= @tripPrice.to_f / 100 %>
+
+
diff --git a/app/views/payments/update.html.erb b/app/views/payments/update.html.erb
new file mode 100644
index 000000000..059fec6ed
--- /dev/null
+++ b/app/views/payments/update.html.erb
@@ -0,0 +1,4 @@
+
+  %>)
+
+
+
+
+YOU ARE ALL SET!
+ <%= link_to "GO BACK", { controller: '/home', action: 'main' }, class: "go-back-button" %> +
+
diff --git a/app/views/stations/_row.html.erb b/app/views/stations/_row.html.erb
index 68a74d983..e412218ed 100644
--- a/app/views/stations/_row.html.erb
+++ b/app/views/stations/_row.html.erb
@@ -1,3 +1,10 @@
-Payments#update
+Find me in app/views/payments/update.html.erb
+ flexbox vertical stretch">
- <%= station.identifier %>: <%= station.name %> (<%= station.address %>)
+Ride Confirmation
+
+
+
+
+
+ <%= station.name %>
Total Bikes:<%= station.docked_bikes.count%> + <% @identifier = station.identifier %> + +
\ No newline at end of file
diff --git a/app/views/stations/index.html.erb b/app/views/stations/index.html.erb
index d211dda42..0ea1e9c6d 100644
--- a/app/views/stations/index.html.erb
+++ b/app/views/stations/index.html.erb
@@ -1,16 +1,32 @@
-Total Bikes:<%= station.docked_bikes.count%> + <% @identifier = station.identifier %> + +
+
diff --git a/app/views/stations/show.html.erb b/app/views/stations/show.html.erb
new file mode 100644
index 000000000..5fcb80cdc
--- /dev/null
+++ b/app/views/stations/show.html.erb
@@ -0,0 +1,31 @@
+Meet the Team
+
+
+
+
\ No newline at end of file
diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb
new file mode 100644
index 000000000..aa0f704dd
--- /dev/null
+++ b/app/views/trips/new.html.erb
@@ -0,0 +1,30 @@
+
+
- Welcome to ValetBike!
+
+
+ AVAILABLE STATIONS
+
+
<% if @stations.present? %>
+
+
+
+
+
<% else %>
+
+
<%= render(partial: "stations/row", collection: @stations, as: :station) %>
+
+
+
+
No stations found.
<% end %>
+ <%= link_to "".html_safe, root_path %>
+
+
diff --git a/app/views/stations_map/index.html.erb b/app/views/stations_map/index.html.erb
new file mode 100644
index 000000000..ee5b279ab
--- /dev/null
+++ b/app/views/stations_map/index.html.erb
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= @current_station.name %>
+
+
+ <%if @current_station.docked_bikes.present? %>
+
+
+
+
+
+ <% else %>
+
+
+
+ <%= render(partial: "bikes/row", collection: @bikes, as: :bike) %>
+
+
+
+
+ No bikes found.
+
+ <% end %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/team/index.html.erb b/app/views/team/index.html.erb
new file mode 100644
index 000000000..553a19f32
--- /dev/null
+++ b/app/views/team/index.html.erb
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ Meet the Team
+ <%= image_tag("team.JPG", alt: "Team Image", class: "team-image") %> +
+
+
+
\ No newline at end of file
diff --git a/app/views/trips/_rentalform.html.erb b/app/views/trips/_rentalform.html.erb
new file mode 100644
index 000000000..a8c9f9e8c
--- /dev/null
+++ b/app/views/trips/_rentalform.html.erb
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+ Maggie
+mneedham@smith.edu
+Computer Science & Music
+
+
+ Nafisa
+nmohamed@smith.edu
+Smith College
+Class of 2026
+Computer Science
+
+
+ Fernanda
+jaltamiranobello@smith.edu
+Smith College
+Class of 2026
+Computer Science
+
+
+ Mackenzie
+mmartin@smith.edu
+Smith College
+Computer Science
+ +
+
+ Maria
+igart24m@mtholyoke.edu
+Mount Holyoke College
+Class of 2027
+Computer Science
+
+ <%= station.name %>
Total Bikes:<%= station.docked_bikes.count%> + <% @identifier = station.identifier %> + + <%= link_to update_trip_path(identifier: station.identifier) do %> + + <% end %> +
+
\ No newline at end of file
diff --git a/app/views/trips/edit.html.erb b/app/views/trips/edit.html.erb
new file mode 100644
index 000000000..395bc4d8d
--- /dev/null
+++ b/app/views/trips/edit.html.erb
@@ -0,0 +1,32 @@
+Total Bikes:<%= station.docked_bikes.count%> + <% @identifier = station.identifier %> + + <%= link_to update_trip_path(identifier: station.identifier) do %> + + <% end %> +
+
diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb
new file mode 100644
index 000000000..ff15c179f
--- /dev/null
+++ b/app/views/trips/index.html.erb
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+ SELECT RETURN STATION
+
+
+
+ <% if @stations.present? %>
+
+
+
+
+
+
+ <% else %>
+
+
+
+ <%= render(partial: "trips/rentalform", collection: @stations, as: :station) %>
+
+
+
+
+ No stations found.
+
+ <% end %>
+ <%= link_to "".html_safe, root_path %>
+
+
+
+
+
+
+
+
+ Trip History
+
+
+
+
+
+
+
+
+
+| Trip ID | +Start Station | +End Station | +Bike ID | +Time Rented | +
|---|---|---|---|---|
| <%= trip.id %> | +<%= trip.start_station.name %> | +<%= trip.end_station&.name || 'In Progress' %> | +<%= trip.bike_used.identifier %> | +<%= trip.formatted_start_time %> | +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
new file mode 100644
index 000000000..19ba71b37
--- /dev/null
+++ b/app/views/trips/show.html.erb
@@ -0,0 +1,62 @@
+
+
+
+ Book Your Ride
+Booking from <%= @bike.current_station.name %> Station
+ <%= link_to "".html_safe, stations_index_path %> + +Booking Bike ID: <%= @bike.identifier %>
+ <%= link_to "".html_safe, stations_show_path(identifier: @bike.current_station.identifier )%> + + + + + +
+
+
+
+
+
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
new file mode 100644
index 000000000..f40173187
--- /dev/null
+++ b/app/views/users/show.html.erb
@@ -0,0 +1,10 @@
+
+ RIDE ON <%= current_user.firstName %>
+
+
+
+
+
+
+
+
+
+
+ TIME START: <%= @trip.formatted_start_time %>
+ TRIP ID: <%= @trip.id %>
+ USER ID: <%= @trip.user_id %>
+
+ <%= link_to('END TRIP', 'edit', class: 'show-trip-end-trip-btn') %>
+
+
+
+
+
\ No newline at end of file
diff --git a/config/initializers/Stripe.rb b/config/initializers/Stripe.rb
new file mode 100644
index 000000000..a57034468
--- /dev/null
+++ b/config/initializers/Stripe.rb
@@ -0,0 +1,5 @@
+Rails.configuration.stripe = {
+ publishable_key: ENV['PUBLISHABLE_KEY'],
+ secret_key: ENV['SECRET_KEY']
+}
+Stripe.api_key = Rails.configuration.stripe[:secret_key]
\ No newline at end of file
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 000000000..30a0042a1
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,315 @@
+# frozen_string_literal: true
+
+# Assuming you have not yet modified this file, each configuration option below
+# is set to its default value. Note that some are commented out while others
+# are not: uncommented lines are intended to protect your configuration from
+# breaking changes in upgrades (i.e., in the event that future versions of
+# Devise change the default values for those options).
+#
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+ # The secret key used by Devise. Devise uses this key to generate
+ # random tokens. Changing this key will render invalid all existing
+ # confirmation, reset password and unlock tokens in the database.
+ # Devise will use the `secret_key_base` as its `secret_key`
+ # by default. You can change it below and use your own secret key.
+ # config.secret_key = '0af54e44e77c418b923d7668e69905e9639932847edf86f49fb66a504d482b490cd1903f40845c19071e29bb5e94d9558679e924fb926e5eaf07be6931543981'
+
+ # ==> Controller configuration
+ # Configure the parent class to the devise controllers.
+ # config.parent_controller = 'DeviseController'
+
+ # ==> Mailer Configuration
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class
+ # with default "from" parameter.
+ config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+ # Configure the class responsible to send e-mails.
+ # config.mailer = 'Devise::Mailer'
+
+ # Configure the parent class responsible to send e-mails.
+ # config.parent_mailer = 'ActionMailer::Base'
+
+ # ==> ORM configuration
+ # Load and configure the ORM. Supports :active_record (default) and
+ # :mongoid (bson_ext recommended) by default. Other ORMs may be
+ # available as additional gems.
+ require 'devise/orm/active_record'
+
+ # ==> Configuration for any authentication mechanism
+ # Configure which keys are used when authenticating a user. The default is
+ # just :email. You can configure it to use [:username, :subdomain], so for
+ # authenticating a user, both parameters are required. Remember that those
+ # parameters are used only when authenticating and not when retrieving from
+ # session. If you need permissions, you should implement that in a before filter.
+ # You can also supply a hash where the value is a boolean determining whether
+ # or not authentication should be aborted when the value is not present.
+ # config.authentication_keys = [:email]
+
+ # Configure parameters from the request object used for authentication. Each entry
+ # given should be a request method and it will automatically be passed to the
+ # find_for_authentication method and considered in your model lookup. For instance,
+ # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+ # The same considerations mentioned for authentication_keys also apply to request_keys.
+ # config.request_keys = []
+
+ # Configure which authentication keys should be case-insensitive.
+ # These keys will be downcased upon creating or modifying a user and when used
+ # to authenticate or find a user. Default is :email.
+ config.case_insensitive_keys = [:email]
+
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [:email]
+
+ # Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
+ # config.params_authenticatable = true
+
+ # Tell if authentication through HTTP Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:database]` will
+ # enable it only for database authentication.
+ # For API-only applications to support authentication "out-of-the-box", you will likely want to
+ # enable this with :database unless you are using a custom strategy.
+ # The supported strategies are:
+ # :database = Support basic authentication with authentication key + password
+ # config.http_authenticatable = false
+
+ # If 401 status code should be returned for AJAX requests. True by default.
+ # config.http_authenticatable_on_xhr = true
+
+ # The realm used in Http Basic Authentication. 'Application' by default.
+ # config.http_authentication_realm = 'Application'
+
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # particular strategies by setting this option.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing skip: :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
+ # By default, Devise cleans up the CSRF token on authentication to
+ # avoid CSRF token fixation attacks. This means that, when using AJAX
+ # requests for sign in and sign up, you need to get a new CSRF token
+ # from the server. You can disable this option at your own risk.
+ # config.clean_up_csrf_token_on_authentication = true
+
+ # When false, Devise will not attempt to reload routes on eager load.
+ # This can reduce the time taken to boot the app but if your application
+ # requires the Devise mappings to be loaded during boot time the application
+ # won't boot properly.
+ # config.reload_routes = true
+
+ # ==> Configuration for :database_authenticatable
+ # For bcrypt, this is the cost for hashing the password and defaults to 12. If
+ # using other algorithms, it sets how many times you want the password to be hashed.
+ # The number of stretches used for generating the hashed password are stored
+ # with the hashed password. This allows you to change the stretches without
+ # invalidating existing passwords.
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments. Note that, for bcrypt (the default
+ # algorithm), the cost increases exponentially with the number of stretches (e.g.
+ # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+ config.stretches = Rails.env.test? ? 1 : 12
+
+ # Set up a pepper to generate the hashed password.
+ # config.pepper = 'bbc4214a4e3113f3afbfe5537631bf749f9483aae0192e5227b265bc3962bdf69d22f743cd22a1bb4c047fe69126a138268f7babfa6ba6f5136d7212390605f5'
+
+ # Send a notification to the original email when the user's email is changed.
+ # config.send_email_changed_notification = false
+
+ # Send a notification email when the user's password is changed.
+ # config.send_password_change_notification = false
+
+ # ==> Configuration for :confirmable
+ # A period that the user is allowed to access the website even without
+ # confirming their account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming their account,
+ # access will be blocked just in the third day.
+ # You can also set it to nil, which will allow the user to access the website
+ # without confirming their account.
+ # Default is 0.days, meaning the user cannot access the website without
+ # confirming their account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed, new email is stored in
+ # unconfirmed_email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
+
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [:email]
+
+ # ==> Configuration for :rememberable
+ # The time the user will be remembered without asking for credentials again.
+ # config.remember_for = 2.weeks
+
+ # Invalidates all the remember me tokens when the user signs out.
+ config.expire_all_remember_me_on_sign_out = true
+
+ # If true, extends the user's remember period when remembered via cookie.
+ # config.extend_remember_period = false
+
+ # Options to be passed to the created cookie. For instance, you can set
+ # secure: true in order to force SSL only cookies.
+ # config.rememberable_options = {}
+
+ # ==> Configuration for :validatable
+ # Range for password length.
+ config.password_length = 6..128
+
+ # Email regex used to validate email formats. It simply asserts that
+ # one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
+
+ # ==> Configuration for :timeoutable
+ # The time you want to timeout the user session without activity. After this
+ # time the user will be asked for credentials again. Default is 30 minutes.
+ # config.timeout_in = 30.minutes
+
+ # ==> Configuration for :lockable
+ # Defines which strategy will be used to lock an account.
+ # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+ # :none = No lock strategy. You should handle locking by yourself.
+ # config.lock_strategy = :failed_attempts
+
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [:email]
+
+ # Defines which strategy will be used to unlock an account.
+ # :email = Sends an unlock link to the user email
+ # :time = Re-enables login after a certain amount of time (see :unlock_in below)
+ # :both = Enables both strategies
+ # :none = No unlock strategy. You should handle unlocking by yourself.
+ # config.unlock_strategy = :both
+
+ # Number of authentication tries before locking an account if lock_strategy
+ # is failed attempts.
+ # config.maximum_attempts = 20
+
+ # Time interval to unlock the account if :time is enabled as unlock_strategy.
+ # config.unlock_in = 1.hour
+
+ # Warn on the last attempt before the account is locked.
+ # config.last_attempt_warning = true
+
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [:email]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 6.hours
+
+ # When set to false, does not sign a user in automatically after their password is
+ # reset. Defaults to true, so a user is signed in automatically after a reset.
+ # config.sign_in_after_reset_password = true
+
+ # ==> Configuration for :encryptable
+ # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
+ # You can use :sha1, :sha512 or algorithms from others authentication tools as
+ # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
+ # for default behavior) and :restful_authentication_sha1 (then you should set
+ # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
+ #
+ # Require the `devise-encryptable` gem when using anything other than bcrypt
+ # config.encryptor = :sha512
+
+ # ==> Scopes configuration
+ # Turn scoped views on. Before rendering "sessions/new", it will first check for
+ # "users/sessions/new". It's turned off by default because it's slower if you
+ # are using only default views.
+ # config.scoped_views = false
+
+ # Configure the default scope given to Warden. By default it's the first
+ # devise role declared in your routes (usually :user).
+ # config.default_scope = :user
+
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
+ # config.sign_out_all_scopes = true
+
+ # ==> Navigation configuration
+ # Lists the formats that should be treated as navigational. Formats like
+ # :html should redirect to the sign in page when the user does not have
+ # access, but formats like :xml or :json, should return 401.
+ #
+ # If you have any extra navigational formats, like :iphone or :mobile, you
+ # should add them to the navigational formats lists.
+ #
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ['*/*', :html, :turbo_stream]
+
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
+
+ # ==> OmniAuth
+ # Add a new OmniAuth provider. Check the wiki for more information on setting
+ # up on your models and hooks.
+ # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+ # ==> Warden configuration
+ # If you want to use other strategies, that are not supported by Devise, or
+ # change the failure app, you can configure them inside the config.warden block.
+ #
+ # config.warden do |manager|
+ # manager.intercept_401 = false
+ # manager.default_strategies(scope: :user).unshift :some_external_strategy
+ # end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: '/my_engine'
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using OmniAuth, Devise cannot automatically set OmniAuth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+ # ==> Hotwire/Turbo configuration
+ # When using Devise with Hotwire/Turbo, the http status for error responses
+ # and some redirects must match the following. The default in Devise for existing
+ # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
+ # these new defaults that match Hotwire/Turbo behavior.
+ # Note: These might become the new default in future versions of Devise.
+ config.responder.error_status = :unprocessable_entity
+ config.responder.redirect_status = :see_other
+
+ # ==> Configuration for :registerable
+
+ # When set to false, does not sign a user in automatically after their password is
+ # changed. Defaults to true, so a user is signed in automatically after changing a password.
+ # config.sign_in_after_change_password = true
+
+ config.navigational_formats = ['*/*', :html, :turbo_stream]
+end
diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
new file mode 100644
index 000000000..e4998c60b
--- /dev/null
+++ b/config/initializers/geocoder.rb
@@ -0,0 +1,5 @@
+Geocoder.configure(
+ lookup: :google,
+ api_key: 'AIzaSyCljDteMix-QtDCZQkYX-IKIYVHUam4Dus',
+ units: :km
+)
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
new file mode 100644
index 000000000..260e1c4ba
--- /dev/null
+++ b/config/locales/devise.en.yml
@@ -0,0 +1,65 @@
+# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
+
+en:
+ devise:
+ confirmations:
+ confirmed: "Your email address has been successfully confirmed."
+ send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+ failure:
+ already_authenticated: "You are already signed in."
+ inactive: "Your account is not activated yet."
+ invalid: "Invalid %{authentication_keys} or password."
+ locked: "Your account is locked."
+ last_attempt: "You have one more attempt before your account is locked."
+ not_found_in_database: "Invalid %{authentication_keys} or password."
+ timeout: "Your session expired. Please sign in again to continue."
+ unauthenticated: "You need to sign in or sign up before continuing."
+ unconfirmed: "You have to confirm your email address before continuing."
+ mailer:
+ confirmation_instructions:
+ subject: "Confirmation instructions"
+ reset_password_instructions:
+ subject: "Reset password instructions"
+ unlock_instructions:
+ subject: "Unlock instructions"
+ email_changed:
+ subject: "Email Changed"
+ password_change:
+ subject: "Password Changed"
+ omniauth_callbacks:
+ failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+ success: "Successfully authenticated from %{kind} account."
+ passwords:
+ no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+ send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
+ send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+ updated: "Your password has been changed successfully. You are now signed in."
+ updated_not_active: "Your password has been changed successfully."
+ registrations:
+ destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+ signed_up: "Welcome! You have signed up successfully."
+ signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+ signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+ signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
+ update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address."
+ updated: "Your account has been updated successfully."
+ updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again."
+ sessions:
+ signed_in: "Signed in successfully."
+ signed_out: "Signed out successfully."
+ already_signed_out: "Signed out successfully."
+ unlocks:
+ send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
+ send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+ unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+ errors:
+ messages:
+ already_confirmed: "was already confirmed, please try signing in"
+ confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+ expired: "has expired, please request a new one"
+ not_found: "not found"
+ not_locked: "was not locked"
+ not_saved:
+ one: "1 error prohibited this %{resource} from being saved:"
+ other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/routes.rb b/config/routes.rb
index f1eb0a0d8..48314205b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,42 @@
Rails.application.routes.draw do
- root to: "stations#index"
-end
\ No newline at end of file
+ get '/payments/success', to: 'payments#success'
+ get '/payments/cancel'
+ get 'trips/create', to: 'trips#create', as:'create_trip'
+ get 'trips/update', to: "trips#update", as:'update_trip'
+
+ resources :payments
+
+ get 'trips/index'
+ get 'trips/new'
+ get 'trips/show'
+ get 'trips/edit'
+
+
+ get 'map-test', to: 'map_test#index', as: 'map_test'
+
+ # get 'trips/new'
+
+
+ #post 'payments/create'
+ # get 'payments/success'
+ # get 'payments/cancel'
+ # adds devise routes for Users
+ devise_for :users
+
+ get "stations/show"
+ get "stations/index"
+ get 'bikes/index'
+ get 'bikes/show'
+ get 'users/show'
+
+
+ get 'users/verify_account'
+ get 'users/delete_account'
+
+ root to: "home#main"
+
+ get 'team', to: 'team#index'
+
+
+
+end
diff --git a/db/migrate/20241103155138_create_cards.rb b/db/migrate/20241103155138_create_cards.rb
new file mode 100644
index 000000000..92e078316
--- /dev/null
+++ b/db/migrate/20241103155138_create_cards.rb
@@ -0,0 +1,11 @@
+class CreateCards < ActiveRecord::Migration[7.0]
+ def change
+ create_table :cards do |t|
+ t.string :card_information
+ t.boolean :verified
+ t.integer :card_balance
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241103162736_create_trips.rb b/db/migrate/20241103162736_create_trips.rb
new file mode 100644
index 000000000..f420cf94c
--- /dev/null
+++ b/db/migrate/20241103162736_create_trips.rb
@@ -0,0 +1,11 @@
+class CreateTrips < ActiveRecord::Migration[7.0]
+ def change
+ create_table :trips do |t|
+ t.integer :identifier
+ t.integer :start_time
+ t.integer :end_time
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241103163337_create_customers.rb b/db/migrate/20241103163337_create_customers.rb
new file mode 100644
index 000000000..45372d19a
--- /dev/null
+++ b/db/migrate/20241103163337_create_customers.rb
@@ -0,0 +1,9 @@
+class CreateCustomers < ActiveRecord::Migration[7.0]
+ def change
+ create_table :customers do |t|
+ t.integer :identifier
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241103164205_add_relational_columns_to_trips.rb b/db/migrate/20241103164205_add_relational_columns_to_trips.rb
new file mode 100644
index 000000000..ad136c680
--- /dev/null
+++ b/db/migrate/20241103164205_add_relational_columns_to_trips.rb
@@ -0,0 +1,8 @@
+class AddRelationalColumnsToTrips < ActiveRecord::Migration[7.0]
+ def change
+ add_column :trips, :start_station_id, :integer
+ add_column :trips, :end_station_id, :integer
+ add_column :trips, :bike_used_id, :integer
+ add_column :trips, :customer_id, :integer
+ end
+end
diff --git a/db/migrate/20241107200346_devise_create_users.rb b/db/migrate/20241107200346_devise_create_users.rb
new file mode 100644
index 000000000..43927dbd1
--- /dev/null
+++ b/db/migrate/20241107200346_devise_create_users.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class DeviseCreateUsers < ActiveRecord::Migration[7.0]
+ def change
+ create_table :users do |t|
+ ## Database authenticatable
+ t.string :email, null: false, default: ""
+ t.string :encrypted_password, null: false, default: ""
+
+ ## Recoverable
+ t.string :reset_password_token
+ t.datetime :reset_password_sent_at
+
+ ## Rememberable
+ t.datetime :remember_created_at
+
+ ## Trackable
+ # t.integer :sign_in_count, default: 0, null: false
+ # t.datetime :current_sign_in_at
+ # t.datetime :last_sign_in_at
+ # t.string :current_sign_in_ip
+ # t.string :last_sign_in_ip
+
+ ## Confirmable
+ # t.string :confirmation_token
+ # t.datetime :confirmed_at
+ # t.datetime :confirmation_sent_at
+ # t.string :unconfirmed_email # Only if using reconfirmable
+
+ ## Lockable
+ # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+ # t.string :unlock_token # Only if unlock strategy is :email or :both
+ # t.datetime :locked_at
+
+
+ t.timestamps null: false
+ end
+
+ add_index :users, :email, unique: true
+ add_index :users, :reset_password_token, unique: true
+ # add_index :users, :confirmation_token, unique: true
+ # add_index :users, :unlock_token, unique: true
+ end
+end
diff --git a/db/migrate/20241109202527_add_first_name_to_users.rb b/db/migrate/20241109202527_add_first_name_to_users.rb
new file mode 100644
index 000000000..e4e801982
--- /dev/null
+++ b/db/migrate/20241109202527_add_first_name_to_users.rb
@@ -0,0 +1,5 @@
+class AddFirstNameToUsers < ActiveRecord::Migration[7.0]
+ def change
+ add_column :users, :firstName, :string
+ end
+end
diff --git a/db/migrate/20241109202816_add_last_name_to_users.rb b/db/migrate/20241109202816_add_last_name_to_users.rb
new file mode 100644
index 000000000..f7731c59e
--- /dev/null
+++ b/db/migrate/20241109202816_add_last_name_to_users.rb
@@ -0,0 +1,5 @@
+class AddLastNameToUsers < ActiveRecord::Migration[7.0]
+ def change
+ add_column :users, :lastName, :string
+ end
+end
diff --git a/db/migrate/20241122191433_replace_customer_with_user.rb b/db/migrate/20241122191433_replace_customer_with_user.rb
new file mode 100644
index 000000000..edbd8635c
--- /dev/null
+++ b/db/migrate/20241122191433_replace_customer_with_user.rb
@@ -0,0 +1,6 @@
+class ReplaceCustomerWithUser < ActiveRecord::Migration[7.0]
+ def change
+ add_column :trips, :user_id, :integer
+ remove_column :trips, :customer_id
+ end
+end
diff --git a/db/migrate/20241202231823_create_payments.rb b/db/migrate/20241202231823_create_payments.rb
new file mode 100644
index 000000000..f1884fb25
--- /dev/null
+++ b/db/migrate/20241202231823_create_payments.rb
@@ -0,0 +1,9 @@
+class CreatePayments < ActiveRecord::Migration[7.0]
+ def change
+ create_table :payments do |t|
+ t.integer :price
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241203201618_add_price_to_trips.rb b/db/migrate/20241203201618_add_price_to_trips.rb
new file mode 100644
index 000000000..e4cba79e1
--- /dev/null
+++ b/db/migrate/20241203201618_add_price_to_trips.rb
@@ -0,0 +1,5 @@
+class AddPriceToTrips < ActiveRecord::Migration[7.0]
+ def change
+ add_column :trips, :price, :float
+ end
+end
diff --git a/db/migrate/20241208082959_add_latitude_and_longitude_to_stations.rb b/db/migrate/20241208082959_add_latitude_and_longitude_to_stations.rb
new file mode 100644
index 000000000..6f73a9a0b
--- /dev/null
+++ b/db/migrate/20241208082959_add_latitude_and_longitude_to_stations.rb
@@ -0,0 +1,6 @@
+class AddLatitudeAndLongitudeToStations < ActiveRecord::Migration[7.0]
+ def change
+ add_column :stations, :latitude, :float
+ add_column :stations, :longitude, :float
+ end
+end
diff --git a/db/migrate/20241208084358_add_details_to_stations.rb b/db/migrate/20241208084358_add_details_to_stations.rb
new file mode 100644
index 000000000..ef5512818
--- /dev/null
+++ b/db/migrate/20241208084358_add_details_to_stations.rb
@@ -0,0 +1,8 @@
+class AddDetailsToStations < ActiveRecord::Migration[7.0]
+ def change
+ add_column :stations, :has_kiosk, :boolean
+ add_column :stations, :needs_maintenance, :boolean
+ add_column :stations, :dock_count, :integer
+ add_column :stations, :docked_bike_count, :integer
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b98268f0e..a4cfe86f3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2022_08_31_090719) do
+ActiveRecord::Schema[7.0].define(version: 2024_12_08_084358) do
create_table "bikes", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.integer "identifier"
t.integer "current_station_id"
@@ -18,12 +18,65 @@
t.datetime "updated_at", null: false
end
+ create_table "cards", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.string "card_information"
+ t.boolean "verified"
+ t.integer "card_balance"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "customers", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.integer "identifier"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "payments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.integer "price"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
create_table "stations", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.integer "identifier"
t.string "name"
t.string "address"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.float "latitude"
+ t.float "longitude"
+ t.boolean "has_kiosk"
+ t.boolean "needs_maintenance"
+ t.integer "dock_count"
+ t.integer "docked_bike_count"
+ end
+
+ create_table "trips", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.integer "identifier"
+ t.integer "start_time"
+ t.integer "end_time"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "start_station_id"
+ t.integer "end_station_id"
+ t.integer "bike_used_id"
+ t.integer "user_id"
+ t.float "price"
+ end
+
+ create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
+ t.string "reset_password_token"
+ t.datetime "reset_password_sent_at"
+ t.datetime "remember_created_at"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "firstName"
+ t.string "lastName"
+ t.index ["email"], name: "index_users_on_email", unique: true
+ t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
end
end
diff --git a/db/seeds.rb b/db/seeds.rb
index bc25fce30..da00ed793 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,21 @@
#
# movies = Movie.create([{ name: "Star Wars" }, { name: "Lord of the Rings" }])
# Character.create(name: "Luke", movie: movies.first)
+
+
+require 'csv'
+
+CSV.foreach(Rails.root.join('notes/station-data.csv'), headers: true) do |row|
+ Station.create(
+ identifier: row['identifier'],
+ name: row['name'],
+ address: row['address'],
+ latitude: row['latitude'],
+ longitude: row['longitude'],
+ has_kiosk: row['has_kiosk'] == "1",
+ needs_maintenance: row['needs_maintenance'] == "1",
+ dock_count: row['dock_count'].to_i,
+ docked_bike_count: row['docked_bike_count'].to_i
+ )
+end
+
diff --git a/exit b/exit
new file mode 100644
index 000000000..44b3fb35d
--- /dev/null
+++ b/exit
@@ -0,0 +1,8 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABA732zqj5
+c94ku9T0Z8fFb1AAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAINTYtnYrSbxf2ioi
+yzD0Bq/wfF5Mscag5vRysmOP2f5XAAAAoDt8AMIH4UcbKaXtvMf17W3mBI4p8tgISpbRZZ
+Ij3WruqB9gGDArTjRpsVP8N67OAAMIglkqZwr19ai0vbQJvwwK/RSWNQW8ATbWmD/xFsvu
+YevSnKP0pWwqf6+HK4nLIsgBpExk1eTIcv+Dr4qn/E/RmtEQUTUy+nt9ME3bdb3GIpeVrS
+Ag+UxuSg+yseL9pu46+brdHkCkcdboEkoAe78=
+-----END OPENSSH PRIVATE KEY-----
diff --git a/exit.pub b/exit.pub
new file mode 100644
index 000000000..83bc53556
--- /dev/null
+++ b/exit.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINTYtnYrSbxf2ioiyzD0Bq/wfF5Mscag5vRysmOP2f5X mariajoseigxrtux@gmail.com
diff --git a/lib/tasks/import_bikes.rake b/lib/tasks/import_bikes.rake
new file mode 100644
index 000000000..54414b681
--- /dev/null
+++ b/lib/tasks/import_bikes.rake
@@ -0,0 +1,22 @@
+namespace :db do
+
+ desc "Creates the database from the data in notes/bike-data.csv"
+
+ task :import_bikes => :environment do |task|
+ require 'csv'
+ puts "importing bikes data..."
+ CSV.parse(File.read("notes/bike-data.csv"), headers: true).each do |row|
+ puts "importing: #{row.to_hash["name"]}\n"
+ item = row.to_hash
+ bike = Bike.new({
+ identifier: item["identifier"],
+ current_station_id: item["current_station_identifier"]})
+ if bike.save
+ puts "Successfully imported: #{item["identifier"]}\n"
+ else
+ puts "Failed to import: #{item["identifier"]}\n"
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/lib/tasks/import_stations.rake b/lib/tasks/import_stations.rake
new file mode 100644
index 000000000..9b35c0a1c
--- /dev/null
+++ b/lib/tasks/import_stations.rake
@@ -0,0 +1,24 @@
+# Run the command rake db:import_stations
+namespace :db do
+
+ desc "Creates the database from the data in notes/station-data.csv"
+
+ task :import_stations => :environment do |task|
+ require 'csv'
+ puts "importing station data..."
+ CSV.parse(File.read("notes/station-data.csv"), headers: true).each do |row|
+ puts "importing: #{row.to_hash["name"]}\n"
+ item = row.to_hash
+ station = Station.new({
+ identifier: item["identifier"],
+ name: item["name"],
+ address: item["address"]})
+ if station.save
+ puts "Successfully imported: #{item["name"]}\n"
+ else
+ puts "Failed to import: #{item["name"]}\n"
+ end
+
+ end
+ end
+end
\ No newline at end of file
diff --git a/notes/station-data.csv b/notes/station-data.csv
index 6f147a8a8..fb629b9fd 100644
--- a/notes/station-data.csv
+++ b/notes/station-data.csv
@@ -1,15 +1,15 @@
-identifier,name,has_kiosk,needs_maintenance,dock_count,docked_bike_count,address
-21,Florence Bank Station,0,0,7,4,19 Meadow Street Florence MA @ Lilly Library
-24,Florence Center,0,0,10,2,31 Main Street Florence MA
-30,Jackson Street,0,0,16,8,7A-7D Jackson Street Northampton MA
-25,Cooley Dickinson Health Care,0,1,14,6,51 Locust Street Northampton MA
-29,State St/Mass Central Rail Trail,0,0,10,4,State Street/Mass Central Rail Trail
-33,Northampton High School,0,0,15,8,380 Elm Street Northampton MA
-20,Village Hill/State Hospital,0,0,14,6,Village Hill/State Hospital
-26,John M Greene Hall/Smith College,0,0,16,5,1 Chapin Way Northampton MA @ John M. Greene Hall
-23,Forbes Library,0,0,13,6,20 West Street Northampton MA
-27,Pulaski Park/Downtown,1,0,11,3,274 Main Street Northampton MA at Pulaski Park
-31,Main Street/Court House,0,1,10,3,99 Main Street Northampton MA
-28,Northampton Train Station,1,0,13,5,Northampton Train Station
-32,Main Street/Bridge Street,0,0,15,8,1 Bridge Street Northampton MA
-22,YMCA/Childs Park,0,0,17,8,YMCA/Childs Park
\ No newline at end of file
+identifier,name,has_kiosk,needs_maintenance,dock_count,docked_bike_count,address,latitude,longitude
+21,Florence Bank Station,0,0,7,4,19 Meadow Street Florence MA @ Lilly Library,42.33516,-72.67319
+24,Florence Center,0,0,10,2,31 Main Street Florence MA,42.33650,-72.67180
+30,Jackson Street,0,0,16,8,7A-7D Jackson Street Northampton MA,42.32390,-72.63550
+25,Cooley Dickinson Health Care,0,1,14,6,51 Locust Street Northampton MA,42.32480,-72.65020
+29,State St/Mass Central Rail Trail,0,0,10,4,State Street/Mass Central Rail Trail,42.31900,-72.63000
+33,Northampton High School,0,0,15,8,380 Elm Street Northampton MA,42.32300,-72.64000
+20,Village Hill/State Hospital,0,0,14,6,Village Hill/State Hospital,42.32500,-72.64500
+26,John M Greene Hall/Smith College,0,0,16,5,1 Chapin Way Northampton MA @ John M. Greene Hall,42.31700,-72.63700
+23,Forbes Library,0,0,13,6,20 West Street Northampton MA,42.31750,-72.63250
+27,Pulaski Park/Downtown,1,0,11,3,274 Main Street Northampton MA at Pulaski Park,42.31800,-72.63100
+31,Main Street/Court House,0,1,10,3,99 Main Street Northampton MA,42.31900,-72.63050
+28,Northampton Train Station,1,0,13,5,Northampton Train Station,42.31950,-72.62950
+32,Main Street/Bridge Street,0,0,15,8,1 Bridge Street Northampton MA,42.32000,-72.62800
+22,YMCA/Childs Park,0,0,17,8,YMCA/Childs Park,42.32100,-72.62700
diff --git a/routes.rb b/routes.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/controllers/bike_controller_test.rb b/test/controllers/bike_controller_test.rb
new file mode 100644
index 000000000..3d9ccd81d
--- /dev/null
+++ b/test/controllers/bike_controller_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class BikeControllerTest < ActionDispatch::IntegrationTest
+ test "should get get_bike_id" do
+ get bike_get_bike_id_url
+ assert_response :success
+ end
+
+ test "should get get_station_id" do
+ get bike_get_station_id_url
+ assert_response :success
+ end
+
+ test "should get get_station_name" do
+ get bike_get_station_name_url
+ assert_response :success
+ end
+
+ test "should get get_battery_percentage" do
+ get bike_get_battery_percentage_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/bikes_controller_test.rb b/test/controllers/bikes_controller_test.rb
new file mode 100644
index 000000000..aabe3b5d3
--- /dev/null
+++ b/test/controllers/bikes_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class BikesControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get bikes_index_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/customer_controller_test.rb b/test/controllers/customer_controller_test.rb
new file mode 100644
index 000000000..64c8e5910
--- /dev/null
+++ b/test/controllers/customer_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class CustomerControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get customer_index_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/home_controller_test.rb b/test/controllers/home_controller_test.rb
new file mode 100644
index 000000000..eac0e3360
--- /dev/null
+++ b/test/controllers/home_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class HomeControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/map_test_controller_test.rb b/test/controllers/map_test_controller_test.rb
new file mode 100644
index 000000000..29357aceb
--- /dev/null
+++ b/test/controllers/map_test_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class MapTestControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/payments_controller_test.rb b/test/controllers/payments_controller_test.rb
new file mode 100644
index 000000000..cab9bfffa
--- /dev/null
+++ b/test/controllers/payments_controller_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class PaymentsControllerTest < ActionDispatch::IntegrationTest
+ test "should get new" do
+ get payments_new_url
+ assert_response :success
+ end
+
+ test "should get create" do
+ get payments_create_url
+ assert_response :success
+ end
+
+ test "should get edit" do
+ get payments_edit_url
+ assert_response :success
+ end
+
+ test "should get update" do
+ get payments_update_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/stations_map_controller_test.rb b/test/controllers/stations_map_controller_test.rb
new file mode 100644
index 000000000..c84d0b109
--- /dev/null
+++ b/test/controllers/stations_map_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class StationsMapControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get stations_map_index_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/team_controller_test.rb b/test/controllers/team_controller_test.rb
new file mode 100644
index 000000000..93008bd78
--- /dev/null
+++ b/test/controllers/team_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class TeamControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/trip_controller_test.rb b/test/controllers/trip_controller_test.rb
new file mode 100644
index 000000000..88ecfe311
--- /dev/null
+++ b/test/controllers/trip_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class TripControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get trip_index_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb
new file mode 100644
index 000000000..8a802689a
--- /dev/null
+++ b/test/controllers/trips_controller_test.rb
@@ -0,0 +1,13 @@
+require "test_helper"
+
+class TripsControllerTest < ActionDispatch::IntegrationTest
+ test "should get new" do
+ get trips_new_url
+ assert_response :success
+ end
+
+ test "should get create" do
+ get trips_create_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
new file mode 100644
index 000000000..61c15322b
--- /dev/null
+++ b/test/controllers/users_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class UsersControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/fixtures/cards.yml b/test/fixtures/cards.yml
new file mode 100644
index 000000000..0d7c84977
--- /dev/null
+++ b/test/fixtures/cards.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ card_information: MyString
+ verified: false
+ card_balance: 1
+
+two:
+ card_information: MyString
+ verified: false
+ card_balance: 1
diff --git a/test/fixtures/customers.yml b/test/fixtures/customers.yml
new file mode 100644
index 000000000..be1cd39f5
--- /dev/null
+++ b/test/fixtures/customers.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ identifier: 1
+
+two:
+ identifier: 1
diff --git a/test/fixtures/payments.yml b/test/fixtures/payments.yml
new file mode 100644
index 000000000..417773eef
--- /dev/null
+++ b/test/fixtures/payments.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ price: 1
+
+two:
+ price: 1
diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml
new file mode 100644
index 000000000..d4052d91d
--- /dev/null
+++ b/test/fixtures/trips.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ identifier: 1
+ start_time: 1
+ end_time: 1
+
+two:
+ identifier: 1
+ start_time: 1
+ end_time: 1
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
new file mode 100644
index 000000000..d7a332924
--- /dev/null
+++ b/test/fixtures/users.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the "{}" from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/models/card_test.rb b/test/models/card_test.rb
new file mode 100644
index 000000000..133d5b60a
--- /dev/null
+++ b/test/models/card_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class CardTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/customer_test.rb b/test/models/customer_test.rb
new file mode 100644
index 000000000..8c83c4d9a
--- /dev/null
+++ b/test/models/customer_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class CustomerTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/payment_test.rb b/test/models/payment_test.rb
new file mode 100644
index 000000000..f43bc797b
--- /dev/null
+++ b/test/models/payment_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class PaymentTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/trip_test.rb b/test/models/trip_test.rb
new file mode 100644
index 000000000..c5ff46fcb
--- /dev/null
+++ b/test/models/trip_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class TripTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
new file mode 100644
index 000000000..5c07f4900
--- /dev/null
+++ b/test/models/user_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class UserTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/touch b/touch
new file mode 100644
index 000000000..e69de29bb
+ <%= link_to("Edit Account Information", {controller: '/devise/registrations', action: 'edit'}) %>
+ <%= button_to "Sign out", destroy_user_session_path, method: :delete %>
+ <%= link_to "Back", :back %>
+
+
+ Account Information: <%= current_user.firstName %> <%= current_user.lastName %>
+
+