Skip to content

A1 #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emruckle wants to merge 3 commits into
base: master
Choose a base branch
from
Open

A1 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38e6148
Modified welcome message and added bike count
emruckle Sep 6, 2024
f5f6028
List of bikes at each station is displayed
emruckle Sep 8, 2024
0dbcb38
Rake task
emruckle Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ GEM
nio4r (2.5.8)
nokogiri (1.13.8-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
public_suffix (5.0.0)
Expand Down Expand Up @@ -194,6 +196,8 @@ GEM
strscan (3.0.4)
tailwindcss-rails (2.0.12-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-x86_64-linux)
railties (>= 6.0.0)
thor (1.2.1)
Expand Down Expand Up @@ -223,6 +227,7 @@ GEM

PLATFORMS
arm64-darwin-20
x86_64-darwin-23
x86_64-linux

DEPENDENCIES
Expand Down
13 changes: 12 additions & 1 deletion app/views/stations/_row.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<div class="record-row <%= cycle "odd", "even", name: "row-cycler" %> flexbox vertical stretch">
<%= station.identifier %>: <%= station.name %> (<%= station.address %>)
<%= station.identifier %>: <%= station.name %> (<%= station.address %>) | Bike Count: <%= station.docked_bikes.count %> | Docked Bikes:
<% if station.docked_bikes.count == 0 %>
None
<% else %>
<% station.docked_bikes.each do |bike| %>
<% if bike == station.docked_bikes.last %>
<%= bike.identifier %>
<% else %>
<%= bike.identifier %>,
<% end %>
<% end %>
<% end %>
</div>
2 changes: 1 addition & 1 deletion app/views/stations/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="page-section flexbox vertical stretch">
<div class="section-inner flexbox vertical stretch">
<div class="section-title">
Welcome to ValetBike!
Welcome to Emma's ValetBike!
</div>
<div class="flexbox vertical stretch">
<% if @stations.present? %>
Expand Down
13 changes: 13 additions & 0 deletions lib/tasks/setup.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require 'csv'

desc "Imports a CSV file with station and bike data"
task init_import: [:environment] do
CSV.foreach('./notes/station-data.csv', headers: true, col_sep: ',') do |row|
station = Station.new(identifier: row[0], name: row[1], address: row[6])
station.save!
end
CSV.foreach('./notes/bike-data.csv', headers: true, col_sep: ',') do |row|
bike = Bike.new(identifier: row[0], current_station: Station.find_by(identifier: row[1]))
bike.save!
end
end