ClemenBykes MVP#266

Open

chrvn wants to merge 276 commits into

deadroxy:masterfrom

elenaywang:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 6, 2023

Commits on Nov 7, 2023

Commits on Nov 8, 2023

Updated schema with longitude and latitude (automatically updated with the database migrations)
yloo123
committed
Merge pull request #15 from elenaywang/sprint1
yloo123
authored
Merge pull request #16 from elenaywang/Fixed-Duplicate-Routes-in-routes.rb
yloo123
authored
creates new task instance when rent bike from this station is clicked
mgilliom
committed

Commits on Nov 9, 2023

Commits on Nov 12, 2023

Commits on Nov 13, 2023

added the tasks that pull stations and bikes csv

mgilliom
authored and
Lesly-Gonzalez
committed
committing before rebase still trying to generate rental obj for user when they want to rent bike

mgilliom
authored and
Lesly-Gonzalez
committed
creates new task instance when rent bike from this station is clicked

mgilliom
authored and
Lesly-Gonzalez
committed
click 'rent bike from here' from the root page, takes you to rental: new view where you can put in a time. no submit button,and it's just the new crud, not the create crud.

mgilliom
authored and
Lesly-Gonzalez
committed
click 'rent bike from here' from the root

mgilliom
authored and
Lesly-Gonzalez
committed
rentals is creating an obj. not taking form vals

mgilliom
authored and
Lesly-Gonzalez
committed
merged sprint1 changes to home views and resolved corresponding errors, modified sign out method
elenaywang
committed
Merge branch 'user_feature' of https://github.com/elenaywang/valetbike into user_feature
elenaywang
committed
modified sign out method in devise config file
elenaywang
committed
rental obj is now generating! crud actions still need to be fixed
mgilliom
committed
Generates random 7 digit code, displays it on the webpage and adds it in the rentals table.
Lesly-Gonzalez
committed
Merge branch 'rental_random_code' of https://github.com/elenaywang/valetbike into rental_random_code
Lesly-Gonzalez
committed
Creates random code that displays on the website and is saved in the rentals table
Lesly-Gonzalez
committed
added rental code to renting feature!
mgilliom
committed
deleted an extra button
mgilliom
committed
Random code generation
Lesly-Gonzalez
committed
Merge pull request #18 from elenaywang/rental_random_code
mgilliom
authored
combin generate code of maya_branch to maya_branch
mgilliom
committed
Merge pull request #19 from elenaywang/user_feature
elenaywang
authored
Adds header and footer to website
yloo123
committed

Commits on Nov 14, 2023

Commits on Nov 16, 2023

Merge pull request #22 from elenaywang/fix_duplicate_users
yloo123
authored

Commits on Nov 18, 2023

fixed rent now button
mgilliom
committed
this branch is for return button on rentals/index
mgilliom
committed
committing so Ying can add a button to stations index from map page
mgilliom
committed
Merge branch 'master' of https://github.com/elenaywang/valetbike
Lesly-Gonzalez
committed
No return bike button but the selected station is now going into mysql :,)
mgilliom
committed

Commits on Nov 19, 2023

Merge pull request #23 from elenaywang/return_rental
Lesly-Gonzalez
authored
Fix typo
Lesly-Gonzalez
committed
Merge branch 'master' of https://github.com/elenaywang/valetbike
Lesly-Gonzalez
committed
fixed importing bikes rake file so ea bike has current station
mgilliom
committed
added migration: station_id to rentals table
mgilliom
committed
deleted formating of checkout time in rentals index
Lesly-Gonzalez
committed
when you click rent now, you're redirected to rental/show. there you can click a button to return rental which takes you to the edit page where it lets you choose which station you're returning it …
mgilliom
committed

Commits on Nov 20, 2023

Commits on Nov 21, 2023

Merge pull request #25 from elenaywang/map_fix_and_styling
chrvn
authored

Commits on Nov 24, 2023

Tweak Devise views to ensure consistency
elenaywang
committed

Commits on Nov 28, 2023

Rental associates with logged in user. start and end rental are working, but we still need to make station null while bike is being ridden
mgilliom
committed

Commits on Nov 29, 2023

pseudocode for assigning bike to new rental object
mgilliom
committed

Commits on Nov 30, 2023

Commits on Dec 2, 2023

Commits on Dec 3, 2023

removed the option to schedule ride. return bike works
mgilliom
committed

Commits on Dec 5, 2023

WIP payment feature code for Lesly
chrvn
committed

Commits on Dec 6, 2023

Commits on Dec 7, 2023

Commits on Dec 8, 2023

Commits on Dec 9, 2023

Commits on Dec 10, 2023

Commits on Dec 11, 2023

Commits on Dec 12, 2023