Skip to content

Maria #286

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

Jump to bottom
Open
mariaigartua wants to merge 275 commits into
base: master
Choose a base branch
from
Open

Maria #286

mariaigartua wants to merge 275 commits into from

Conversation

@mariaigartua
Copy link

@mariaigartua mariaigartua commented Nov 1, 2024

added name to README

mariaigartua and others added 21 commits November 5, 2024 15:09
@mariaigartua
Merge pull request #12 from jaltamiranobello/maria
237a48a 
Maria
@jaltamiranobello
delted user related classes to use devise
077f8a7
@jaltamiranobello
added station.rb because accidental deletion
efdf474
@jaltamiranobello
Created Home Controller to set up devise
ec98fcc
@jaltamiranobello
Added Welcome message to home index view
7743ad6
@jaltamiranobello
Mistype the word welcome
a8e4959
@jaltamiranobello
Added gem devise
3a319ae
@jaltamiranobello
Installed devise files
fa40d8c
@jaltamiranobello
Added turbo stream as navigational format
71c8f9b
@jaltamiranobello
Added notice and alert tags
062ce58
@jaltamiranobello
Created User model via devise method
0e9d8cf
@jaltamiranobello
Deleted old User migration NOT devise method
ce7704e
@jaltamiranobello
deleted old routing for manual User controller
bd8d7a3
@jaltamiranobello
Updated db to include devise user db
49b59af
@jaltamiranobello
Devise code that checks user login status
dd86a65
@mneedham01
adjusted database
32e0fe6
@mneedham01
created "main" action and rerouted this to be homepage
4223e12
@mneedham01
added pseudocode to main view page
962c3bf
@mneedham01
ran "rails generate devise:views" to generate the files for the views…
ac0b067 
… that devise has created
@mneedham01
filled in code for main view page
725fa99
@mneedham01
got rid of "Log in" as a shared link
dc996db
jaltamiranobello and others added 30 commits December 3, 2024 15:51
@jaltamiranobello @mariaigartua
Updated the has_many/belongs_to relationship between the bikes and st…
03192ce 
…ations to match by the station identifier rather than the station id to correctly ensure the database matches the csv file
@mneedham01 @mariaigartua
Generated new Trips controller
60e43e8
@mneedham01 @mariaigartua
created new payment controller
70a928c
@mneedham01 @mariaigartua
configured routes; deleted create view file
ac73247
@mneedham01 @mariaigartua
added in code for $5.00 subscription form
e58b073
@mneedham01 @mariaigartua
added create, successes, and cancel code to the payments controller
003b146
@mneedham01 @mariaigartua
added publishable and secret keys as variables not as the actual keys…
a3b15b9 
… lol
@mmartin-smith @mariaigartua
"Updated trip model to have users instaed of customers. Worked on cre…
e790150 
…ate method in new TripsController."
@mmartin-smith @mariaigartua
modify create method to work with new rent bike veiw
2dca1d0
@mneedham01 @mariaigartua
added placeholder crud functions for payment
edcf2bf
@mneedham01 @mariaigartua
create placeholder views for new and edit
dfac289
@jaltamiranobello @mariaigartua
Testing commit to publish branch for others access
4dee6f7
@nmohamed54321 @mariaigartua
intial steps on updating the trip controller
dc96100
@nmohamed54321 @mariaigartua
updating the trip controller to use the crud functions instead
888349e
@mneedham01 @mariaigartua
created payments controller, new and edit placeholder views, and edit…
1ba1051 
…ed routes file
@mneedham01 @mariaigartua
added comments to payments controller and views
9dadee6
@mariaigartua
Created Bike class and getters
46f70a2
@nmohamed54321 @mariaigartua
added the rental path so that when a bike is rent the button takes th…
843944e 
…e user to the rent page
@nmohamed54321 @mariaigartua
added the right path to the view
7828c49
@nmohamed54321 @mariaigartua
added the relationships to the models
17038af
@nmohamed54321 @mariaigartua
removed duplicate files
e07e865
@jaltamiranobello @mariaigartua
Removed the book a ride button since parameters are required and user…
dbcee7f 
…s need to select a bike first
@nmohamed54321 @mariaigartua
function to find the current station that a user rented a bike from
819c9cd
@nmohamed54321 @mariaigartua
Form to display the trip history of a user
c35232d
@mariaigartua
schema.rb update
0ea7d3f
@mariaigartua
Created Bike class and getters
1c3942e
@mariaigartua
Updated Trips View
2e7054f
@nmohamed54321 @mariaigartua
info about bike/station class
e289c3e
@jaltamiranobello @mariaigartua
Updated the has_many/belongs_to relationship between the bikes and st…
d02fb98 
…ations to match by the station identifier rather than the station id to correctly ensure the database matches the csv file
@jaltamiranobello @mariaigartua
Included the stations/index route
6843f60
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mariaigartua @mneedham01 @mmartin-smith @jaltamiranobello @nmohamed54321