-
- Welcome to ValetBike!
-
-
- <% if @stations.present? %>
- <%= render(partial: "stations/row", collection: @stations, as: :station) %>
- <% else %>
-
- No stations found.
+<% content_for :head do %>
+
+
+
+ <%= javascript_include_tag('https://unpkg.com/leaflet-geosearch@latest/dist/bundle.min.js') %>
+ <%= javascript_include_tag('osm_map.js') %>
+<% end %>
+
+<% content_for :content do %>
+
+
+
+ Bikes and Stations
+
+
+ <%= render partial: "stations/leaflet", locals: {lats: @lats, longs: @longs} %>
+
+
+ <% if @stations.present? %>
+ <%= render(partial: "stations/row", collection: @stations, as: :station) %>
+ <% else %>
+
+ No stations found.
+
+ <% end %>
- <% end %>
-
-
+
+<% end %>
diff --git a/app/views/stations/show.html.erb b/app/views/stations/show.html.erb
new file mode 100644
index 000000000..a823d806c
--- /dev/null
+++ b/app/views/stations/show.html.erb
@@ -0,0 +1,11 @@
+<%= button_to('< Back to Stations', {controller: 'stations', action: 'index'}, class: "mt-3 custom-btn btn-outline", method: :get) %>
+
+Info for Station: <%= @station.identifier %>: <%= @station.name %> (<%= @station.address %>)
+<% unless @user.current_trip_id.nil? && @trip.nil?%>
+ <%= link_to 'Return Bike to This Station', end_confirm_path(trip_id: @trip.id, end_station_id: @station.id),
+ class: "mt-3 custom-btn btn-outline" %>
+<% end %>
+
+ <%= Bike.where(current_station_id: @station.id).length %> available bikes:
+ <%= render(partial: "bikes/row", collection: Bike.where(current_station_id: @station.id), as: :bike )%>
+
\ No newline at end of file
diff --git a/app/views/trips/_form.html.erb b/app/views/trips/_form.html.erb
new file mode 100644
index 000000000..c8c3b9f83
--- /dev/null
+++ b/app/views/trips/_form.html.erb
@@ -0,0 +1,23 @@
+
+ New Trip
+
+ Bike ID:
+ <%= @bike.identifier %>
+
+
+
+ User ID:
+ <%= @user.id %>
+
+
+
+ Station:
+ <%= @station.identifier %>
+
+
+
+ Pickup Time
+ <%= f.time_field(:start_time) %>
+
+
+
diff --git a/app/views/trips/confirmation.html.erb b/app/views/trips/confirmation.html.erb
new file mode 100644
index 000000000..fd4ff1018
--- /dev/null
+++ b/app/views/trips/confirmation.html.erb
@@ -0,0 +1,33 @@
+
+
+
+ thanks for booking!!
+ Confirmation
+
+ Trip is Confirmed! id:
+ <%= @trip.id %>
+
+
+
\ 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..e69de29bb
diff --git a/app/views/trips/end_confirmation.html.erb b/app/views/trips/end_confirmation.html.erb
new file mode 100644
index 000000000..00c16f526
--- /dev/null
+++ b/app/views/trips/end_confirmation.html.erb
@@ -0,0 +1,2 @@
+Trip ended!
+
diff --git a/app/views/trips/index.html.erb b/app/views/trips/index.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/trips/new.html.erb b/app/views/trips/new.html.erb
new file mode 100644
index 000000000..0a84e0f21
--- /dev/null
+++ b/app/views/trips/new.html.erb
@@ -0,0 +1,38 @@
+
flexbox vertical stretch">
+ <%= button_to("Back to Bikes", station_path(@station), class: "mt-3 custom-btn btn-outline", method: :get) %>
+
+ <%= form_for(@trip) do |f| %>
+
+ New Trip
+
+ Bike ID:
+ <%= @bike.identifier %>
+
+
+
+ User ID:
+ <%= @user.id %>
+
+
+
+ Station:
+ <%= @station.identifier %>
+
+
+
+ <%= f.hidden_field :bike_id, value: @bike.id %>
+ <%= f.hidden_field :user_id, value: @user.id %>
+ <%= f.hidden_field :start_station_is, value: @station.id %>
+
+
+ Pickup Time
+ <%= f.time_field(:start_time) %>
+
+
+
+
+ <%= f.submit("Create Trip") %>
+
+
+ <% end %>
+
diff --git a/app/views/trips/show.html.erb b/app/views/trips/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
new file mode 100644
index 000000000..ce769696f
--- /dev/null
+++ b/app/views/user/new.html.erb
@@ -0,0 +1,45 @@
+
\ No newline at end of file
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8500f459a..b242f5c70 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -67,4 +67,6 @@
# Uncomment if you wish to allow Action Cable access from any origin.
# config.action_cable.disable_request_forgery_protection = true
+
+ config.action_mailer.default_url_options = {host: 'localhost:3000'}
end
diff --git a/config/importmap.rb b/config/importmap.rb
index 8dce42d40..60a344996 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -4,4 +4,5 @@
pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
+pin "bootstrap", to: 'bootstrap.min.js', preload: true
pin_all_from "app/javascript/controllers", under: "controllers"
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 2eeef966f..c3ae110ab 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,4 +9,11 @@
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )
+Rails.application.config.assets.precompile += %w( form.css )
+
+# uhh so rails told me to add all these inexplicably but it works now so...
+Rails.application.config.assets.precompile += %w( tailwind.css )
+Rails.application.config.assets.precompile += %w( bootstrap.min.js )
+Rails.application.config.assets.precompile += %w( controllers/hello_controller.js )
+Rails.application.config.assets.precompile += %w( controllers/index.js )
+Rails.application.config.assets.precompile += %w( osm_map.js )
diff --git a/config/initializers/geocoder.rb b/config/initializers/geocoder.rb
new file mode 100644
index 000000000..c5edf0e9f
--- /dev/null
+++ b/config/initializers/geocoder.rb
@@ -0,0 +1,27 @@
+Geocoder.configure(
+ # Geocoding options
+ # timeout: 3, # geocoding service timeout (secs)
+ lookup: :nominatim, # name of geocoding service (symbol)
+ # ip_lookup: :ipinfo_io, # name of IP address geocoding service (symbol)
+ language: :en, # ISO-639 language code
+ # use_https: false, # use HTTPS for lookup requests? (if supported)
+ # http_proxy: nil, # HTTP proxy server (user:pass@host:port)
+ # https_proxy: nil, # HTTPS proxy server (user:pass@host:port)
+ # api_key: nil, # API key for geocoding service
+ # cache: nil, # cache object (must respond to #[], #[]=, and #del)
+
+ # Exceptions that should not be rescued by default
+ # (if you want to implement custom error handling);
+ # supports SocketError and Timeout::Error
+ # always_raise: [],
+
+ # Calculation options
+ units: :mi, # :km for kilometers or :mi for miles
+ distances: :linear # :spherical or :linear
+
+ # Cache configuration
+ # cache_options: {
+ # expiration: 2.days,
+ # prefix: 'geocoder:'
+ # }
+)
diff --git a/config/routes.rb b/config/routes.rb
index f1eb0a0d8..1ffcdda4e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,37 @@
Rails.application.routes.draw do
- root to: "stations#index"
+ get 'stations/index'
+ get 'stations/show'
+ get 'bikes/index'
+ get 'bikes/_row'
+ get 'main/pricing'
+ get 'main/contact'
+
+
+ get "confirm", to: "trips#confirmation"
+ get "end_confirm", to: "trips#end_confirmation"
+
+
+ # resources :bikes
+ # resources :stations
+ resources :stations, only: [:index, :show] do
+ resources :bikes, only: [:index, :show]
+ end
+
+ resources :trips, except: [:destroy]
+
+ get "sign-up", to: "user#new"
+ post "sign-up", to: "user#create"
+
+ get "log-in", to: "access#login"
+ post "log-in", to: "access#create"
+ post "log-out", to: "access#destroy"
+
+ get "password/reset", to: "password_resets#new"
+ post "password/reset", to: "password_resets#create"
+ get "password/reset/edit", to: "password_resets#edit"
+ patch "password/reset/edit", to: "password_resets#update"
+
+ resources :account, only: [:index, :destroy]
+
+ root to: "main#index"
end
\ No newline at end of file
diff --git a/db/migrate/20241031151655_create_users.rb b/db/migrate/20241031151655_create_users.rb
new file mode 100644
index 000000000..ca0284b32
--- /dev/null
+++ b/db/migrate/20241031151655_create_users.rb
@@ -0,0 +1,11 @@
+class CreateUsers < ActiveRecord::Migration[7.0]
+ def change
+ create_table :users do |t|
+ t.string :name
+ t.string :email, null: false
+ # t.string :password_digest
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241031210449_add_password_digest_to_users.rb b/db/migrate/20241031210449_add_password_digest_to_users.rb
new file mode 100644
index 000000000..5b478015b
--- /dev/null
+++ b/db/migrate/20241031210449_add_password_digest_to_users.rb
@@ -0,0 +1,6 @@
+class AddPasswordDigestToUsers < ActiveRecord::Migration[7.0]
+ def change
+ add_column :users, :password_digest, :string
+ add_column :users, :string, :string
+ end
+end
diff --git a/db/migrate/20241101172048_add_phone_number_to_users.rb b/db/migrate/20241101172048_add_phone_number_to_users.rb
new file mode 100644
index 000000000..85fbd3aa2
--- /dev/null
+++ b/db/migrate/20241101172048_add_phone_number_to_users.rb
@@ -0,0 +1,5 @@
+class AddPhoneNumberToUsers < ActiveRecord::Migration[7.0]
+ def change
+ add_column :users, :phone_number, :string
+ end
+end
diff --git a/db/migrate/20241110203104_add_availablility.rb b/db/migrate/20241110203104_add_availablility.rb
new file mode 100644
index 000000000..3999bd2ea
--- /dev/null
+++ b/db/migrate/20241110203104_add_availablility.rb
@@ -0,0 +1,5 @@
+class AddAvailablility < ActiveRecord::Migration[7.0]
+ def change
+ add_column :bikes, :is_available, :boolean, :default => true
+ end
+end
diff --git a/db/migrate/20241110210524_create_trips.rb b/db/migrate/20241110210524_create_trips.rb
new file mode 100644
index 000000000..c63317ac2
--- /dev/null
+++ b/db/migrate/20241110210524_create_trips.rb
@@ -0,0 +1,13 @@
+class CreateTrips < ActiveRecord::Migration[7.0]
+ def change
+ create_table :trips do |t|
+ t.integer :bike_id # bike IDENTIFIER
+ t.integer :user_id
+ t.datetime :start_time
+ t.datetime :end_time
+ t.integer :end_station_id # station IDENTIFIER
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20241112212031_geocode_stations.rb b/db/migrate/20241112212031_geocode_stations.rb
new file mode 100644
index 000000000..f5e8262ae
--- /dev/null
+++ b/db/migrate/20241112212031_geocode_stations.rb
@@ -0,0 +1,6 @@
+class GeocodeStations < ActiveRecord::Migration[7.0]
+ def change
+ add_column :stations, :latitude, :double
+ add_column :stations, :longitude, :double
+ end
+end
diff --git a/db/migrate/20241114204842_add_start_station_to_trip.rb b/db/migrate/20241114204842_add_start_station_to_trip.rb
new file mode 100644
index 000000000..931c4c15b
--- /dev/null
+++ b/db/migrate/20241114204842_add_start_station_to_trip.rb
@@ -0,0 +1,5 @@
+class AddStartStationToTrip < ActiveRecord::Migration[7.0]
+ def change
+ add_column :trips, :start_station_is, :integer
+ end
+end
diff --git a/db/migrate/20241120010325_add_trip_to_users.rb b/db/migrate/20241120010325_add_trip_to_users.rb
new file mode 100644
index 000000000..b940d9efc
--- /dev/null
+++ b/db/migrate/20241120010325_add_trip_to_users.rb
@@ -0,0 +1,5 @@
+class AddTripToUsers < ActiveRecord::Migration[7.0]
+ def change
+ add_column :users, :current_trip_id, :integer
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b98268f0e..2b2177047 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,12 +10,13 @@
#
# 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_11_20_184529) do
create_table "bikes", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.integer "identifier"
t.integer "current_station_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.boolean "is_available", default: true
end
create_table "stations", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -24,6 +25,30 @@
t.string "address"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.float "latitude", limit: 53
+ t.float "longitude", limit: 53
+ end
+
+ create_table "trips", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.integer "bike_id"
+ t.integer "user_id"
+ t.datetime "start_time"
+ t.datetime "end_time"
+ t.integer "end_station_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "start_station_is"
+ end
+
+ create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ t.string "name"
+ t.string "email", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "password_digest"
+ t.string "string"
+ t.string "phone_number"
+ t.integer "current_trip_id"
end
end
diff --git a/lib/tasks/load_data.rake b/lib/tasks/load_data.rake
new file mode 100644
index 000000000..626db11e7
--- /dev/null
+++ b/lib/tasks/load_data.rake
@@ -0,0 +1,25 @@
+namespace :load_data do
+ require 'csv'
+
+ desc "Reads the station data in from the CSV."
+ task :station => :environment do
+ CSV.foreach('notes/station-data.csv', :headers => true) do |row| #stations
+ station = Station.create(identifier: row[0],
+ name: row[1],
+ address: row[6])
+ end
+ end
+
+ desc "Reads the bike data in from the CSV."
+ task :bike => :environment do
+
+ CSV.foreach('notes/bike-data.csv', :headers => true) do |row| #bikes
+ station = Station.find_by(identifier: row[1])
+ bike = Bike.create(identifier: row[0], current_station: station)
+ bike.current_station_id = station != nil ? station.id : nil
+ bike.save
+
+ end
+ end
+
+end
diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29bb..ffb2aed28 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/test/controllers/access_controller_test.rb b/test/controllers/access_controller_test.rb
new file mode 100644
index 000000000..13ef117b0
--- /dev/null
+++ b/test/controllers/access_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class AccessControllerTest < ActionDispatch::IntegrationTest
+ test "should get create" do
+ get access_create_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/account_controller_test.rb b/test/controllers/account_controller_test.rb
new file mode 100644
index 000000000..032b870bd
--- /dev/null
+++ b/test/controllers/account_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class AccountControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get account_index_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..4f9b2d3f3
--- /dev/null
+++ b/test/controllers/bikes_controller_test.rb
@@ -0,0 +1,13 @@
+require "test_helper"
+
+class BikesControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get bikes_index_url
+ assert_response :success
+ end
+
+ test "should get _row" do
+ get bikes__row_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/main_controller_test.rb b/test/controllers/main_controller_test.rb
new file mode 100644
index 000000000..759df146c
--- /dev/null
+++ b/test/controllers/main_controller_test.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class MainControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get main_index_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/password_resets_controller_test.rb b/test/controllers/password_resets_controller_test.rb
new file mode 100644
index 000000000..abcca3e88
--- /dev/null
+++ b/test/controllers/password_resets_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class PasswordResetsControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/trips_controller_test.rb b/test/controllers/trips_controller_test.rb
new file mode 100644
index 000000000..c0efe9f75
--- /dev/null
+++ b/test/controllers/trips_controller_test.rb
@@ -0,0 +1,18 @@
+require "test_helper"
+
+class TripsControllerTest < ActionDispatch::IntegrationTest
+ test "should get index" do
+ get trips_index_url
+ assert_response :success
+ end
+
+ test "should get new" do
+ get trips_new_url
+ assert_response :success
+ end
+
+ test "should get edit" do
+ get trips_edit_url
+ assert_response :success
+ end
+end
diff --git a/test/controllers/user_controller_test.rb b/test/controllers/user_controller_test.rb
new file mode 100644
index 000000000..f067a70e1
--- /dev/null
+++ b/test/controllers/user_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class UserControllerTest < ActionDispatch::IntegrationTest
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/fixtures/trips.yml b/test/fixtures/trips.yml
new file mode 100644
index 000000000..45222f191
--- /dev/null
+++ b/test/fixtures/trips.yml
@@ -0,0 +1,15 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ bike_id: 1
+ user_id: 1
+ start_time: 2024-11-10 16:05:24
+ end_time: 2024-11-10 16:05:24
+ end_station_id: 1
+
+two:
+ bike_id: 1
+ user_id: 1
+ start_time: 2024-11-10 16:05:24
+ end_time: 2024-11-10 16:05:24
+ end_station_id: 1
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
new file mode 100644
index 000000000..cc9a815cd
--- /dev/null
+++ b/test/fixtures/users.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ name: MyString
+ email: MyString
+ password: MyString
+
+two:
+ name: MyString
+ email: MyString
+ password: MyString
diff --git a/test/mailers/password_mailer_test.rb b/test/mailers/password_mailer_test.rb
new file mode 100644
index 000000000..6f5cc7daf
--- /dev/null
+++ b/test/mailers/password_mailer_test.rb
@@ -0,0 +1,12 @@
+require "test_helper"
+
+class PasswordMailerTest < ActionMailer::TestCase
+ test "reset" do
+ mail = PasswordMailer.reset
+ assert_equal "Reset", mail.subject
+ assert_equal ["to@example.org"], mail.to
+ assert_equal ["from@example.com"], mail.from
+ assert_match "Hi", mail.body.encoded
+ end
+
+end
diff --git a/test/mailers/previews/password_mailer_preview.rb b/test/mailers/previews/password_mailer_preview.rb
new file mode 100644
index 000000000..684b74290
--- /dev/null
+++ b/test/mailers/previews/password_mailer_preview.rb
@@ -0,0 +1,9 @@
+# Preview all emails at http://localhost:3000/rails/mailers/password_mailer
+class PasswordMailerPreview < ActionMailer::Preview
+
+ # Preview this email at http://localhost:3000/rails/mailers/password_mailer/reset
+ def reset
+ PasswordMailer.reset
+ 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