Maria#286

Open

mariaigartua wants to merge 275 commits into

deadroxy:masterfrom

jaltamiranobello:maria

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

Commits on Nov 3, 2024

Made controllers for trip and customer. Added stub methods for trip class.
mmartin-smith
committed

Commits on Nov 7, 2024

Commits on Nov 8, 2024

Commits on Nov 9, 2024

Commits on Nov 10, 2024

Creates images folder and added the brand logo
jaltamiranobello
committed
Styled Hompage with new information and text color and fonts
jaltamiranobello
committed
added .ico version of the image to images
jaltamiranobello
committed
Changed color output for all section title class objects in html
jaltamiranobello
committed
Created Welcome Page Layout
mariaigartua
committed
got rid of <li> links causing bullet points on login and get started buttons
mneedham01
committed
Added my name to README

mariaigartua
authored and
mmartin-smith
committed
Added my name to README

mariaigartua
authored and
mmartin-smith
committed
Created Bike class and getters

mariaigartua
authored and
mmartin-smith
committed
Deleted get_battery_percentage

mneedham01
authored and
mmartin-smith
committed
Updated Bike class and getters

mariaigartua
authored and
mmartin-smith
committed
Created Card Class

mariaigartua
authored and
mmartin-smith
committed
Created Card Class

mariaigartua
authored and
mmartin-smith
committed
Created Card Class

mariaigartua
authored and
mmartin-smith
committed
Created trip and customer model. Added all model relations required for Trip class. Populated all methods in TripController. NOTE: I am having trouble getting the relationships to work in the Trip …
mmartin-smith
committed
Added basic pages in the trip view and put some basic formatting in. Also tried some more stuff to get the trip database working.
mmartin-smith
committed
Commented out "remember me"
mneedham01
committed
adjusted buttons
mneedham01
committed

Commits on Nov 11, 2024

Updated the css layout of the register page
jaltamiranobello
committed

Commits on Nov 12, 2024

Commits on Nov 14, 2024

Commits on Nov 16, 2024

Commits on Nov 17, 2024

Commits on Nov 19, 2024

Commits on Nov 22, 2024

initalized stripe installment

mneedham01
authored and
mariaigartua
committed
create a stripe payment method in home

mneedham01
authored and
mariaigartua
committed
create payment controller

mneedham01
authored and
mariaigartua
committed
created a new method

mneedham01
authored and
mariaigartua
committed
adjusted routes

mneedham01
authored and
mariaigartua
committed
Merging payment into mackenzie
mariaigartua
committed
Added my name to README
mariaigartua
committed
Created trip and customer model. Added all model relations required for Trip class. Populated all methods in TripController. NOTE: I am having trouble getting the relationships to work in the Trip …

mmartin-smith
authored and
mariaigartua
committed
Added basic pages in the trip view and put some basic formatting in. Also tried some more stuff to get the trip database working.

mmartin-smith
authored and
mariaigartua
committed
Built out trip functionality, including start_trip and end_trip methods.

mmartin-smith
authored and
mariaigartua
committed
Created Bike class and getters
mariaigartua
committed
Updated Main Page View
mariaigartua
committed
Created Bike class and getters
mariaigartua
committed
Created Card Class
mariaigartua
committed
Pulling payment into branch Mackenzie

mmartin-smith
authored and
mariaigartua
committed
updated link to "my account" on main page to the devise users, not users deprecated

mneedham01
authored and
mariaigartua
committed
added "new" and "create" methods to trip class; renamed "book" view page to "new"

mneedham01
authored and
mariaigartua
committed
I don't even know. The only change is one extra empty line in schema.rb.

mmartin-smith
authored and
mariaigartua
committed
changed routes file to add new routes for CRUD verbs

mneedham01
authored and
mariaigartua
committed
deleted all trip-related code

mneedham01
authored and
mariaigartua
committed
Generated new Trips controller

mneedham01
authored and
mariaigartua
committed
added resourceful routes

mneedham01
authored and
mariaigartua
committed
added back trip model file

mneedham01
authored and
mariaigartua
committed
added back in code for new trip form; deleted create view (unnecessary)

mneedham01
authored and
mariaigartua
committed
updated form

mneedham01
authored and
mariaigartua
committed
added in code from task helper example; changed form to directly link to @trip

mneedham01
authored and
mariaigartua
committed
deleted link to new trip

mneedham01
authored and
mariaigartua
committed
Created Bike class and getters
mariaigartua
committed
Created Card Class
mariaigartua
committed
Update Main View and other views
mariaigartua
committed
Added FAQ to the welcome page view
mariaigartua
committed

Commits on Nov 27, 2024

Updated Trips View
mariaigartua
committed

Commits on Dec 3, 2024

info about bike/station class

nmohamed54321
authored and
mariaigartua
committed
created a rake file to read the bikes

nmohamed54321
authored and
mariaigartua
committed
started the rake file for stations

nmohamed54321
authored and
mariaigartua
committed
read in the csv for station to create rake database

nmohamed54321
authored and
mariaigartua
committed
Completed the rake task to read in the database also updated the database

nmohamed54321
authored and
mariaigartua
committed
Added more css to manipulate the view for the stations and bikes

nmohamed54321
authored and
mariaigartua
committed
Previous on Added more css to manipulate the view for the stations and bikes

nmohamed54321
authored and
mariaigartua
committed
Added the bike methods in the controller class

nmohamed54321
authored and
mariaigartua
committed
Added the station methods in the controller class

nmohamed54321
authored and
mariaigartua
committed
Created a partial for the bike

nmohamed54321
authored and
mariaigartua
committed
deleted the view pages called delete and new

nmohamed54321
authored and
mariaigartua
committed
Added the needed code in the index file to call the partial and display the stations

nmohamed54321
authored and
mariaigartua
committed
Added the needed code for the show page of the stations so that it displays the current bikes at a specific station by rendering the bike partial

nmohamed54321
authored and
mariaigartua
committed
Just deleted something I added for testing hhhh

nmohamed54321
authored and
mariaigartua
committed
added css and stwiched the locations of some

nmohamed54321
authored and
mariaigartua
committed
Fixed the writing in how it appeared on the view

nmohamed54321
authored and
mariaigartua
committed
Testing purposes for now. but i think i might delete this page later

nmohamed54321
authored and
mariaigartua
committed
I have to fix something in this page later today. you can pull it if u want, but currently I will look into the bug later. Basically want the page to render the bike partial

nmohamed54321
authored and
mariaigartua
committed
added br tag and got rid of some unnessecary stuff

nmohamed54321
authored and
mariaigartua
committed
Changed the name at the end

nmohamed54321
authored and
mariaigartua
committed
There is no bug, but will modify this so that it displays all the bikes as well

nmohamed54321
authored and
mariaigartua
committed
Created header for the station index page

nmohamed54321
authored and
mariaigartua
committed
updated to show the station by the identifier

nmohamed54321
authored and
mariaigartua
committed
Made CSS classes for to create the header for the stations index page

nmohamed54321
authored and
mariaigartua
committed
Added the css for the buttons, but they are responsive to on click will add that tmwr

nmohamed54321
authored and
mariaigartua
committed
Added a p tag

nmohamed54321
authored and
mariaigartua
committed
fixes the text on the view

nmohamed54321
authored and
mariaigartua
committed
Updated nio4r package

jaltamiranobello
authored and
mariaigartua
committed
Updated the bikes to correctly match the stations based on the identifier rather than the id as each database is different

nmohamed54321
authored and
mariaigartua
committed
Updated the has_many/belongs_to relationship between the bikes and stations to match by the station identifier rather than the station id to correctly ensure the database matches the csv file

jaltamiranobello
authored and
mariaigartua
committed
Added formatted header for the view bike inventory page

jaltamiranobello
authored and
mariaigartua
committed
added more css for button reactions

nmohamed54321
authored and
mariaigartua
committed
added a button show

nmohamed54321
authored and
mariaigartua
committed
added a link back to the stations

nmohamed54321
authored and
mariaigartua
committed
Created button/updated format in the view bike inventory to return to the stations list

jaltamiranobello
authored and
mariaigartua
committed
Added a button that will later connect to the start trip path

jaltamiranobello
authored and
mariaigartua
committed
Updated the button in the view stations to render the inventory of the current instance varaible of station which displays the bike inventory

jaltamiranobello
authored and
mariaigartua
committed
Included the stations/index route

jaltamiranobello
authored and
mariaigartua
committed
First commit in stations branch

jaltamiranobello
authored and
mariaigartua
committed
Created rake task to read in the station csv file into the database

jaltamiranobello
authored and
mariaigartua
committed
Removed extra bike controller

jaltamiranobello
authored and
mariaigartua
committed
included old bike methods in one controller to not delete any old functionality if needed

jaltamiranobello
authored and
mariaigartua
committed
Fixed syntax errors in the css page

jaltamiranobello
authored and
mariaigartua
committed
Updated error in the css page to properly render the station and bikes inventory views

jaltamiranobello
authored and
mariaigartua
committed
Added button in main page to allow users to view the station and bike inventory from the home page

jaltamiranobello
authored and
mariaigartua
committed
Added button so user's can return to the main homepage with the map from the account & settings page

jaltamiranobello
authored and
mariaigartua
committed
Added a button so users can return to the main homepage with the map view after viewing the stations

jaltamiranobello
authored and
mariaigartua
committed
Added manual google maps with pin points of stations

jaltamiranobello
authored and
mariaigartua
committed
Formatted the title view stations

jaltamiranobello
authored and
mariaigartua
committed
Updated map to have the stations points

jaltamiranobello
authored and
mariaigartua
committed
added css for the map

nmohamed54321
authored and
mariaigartua
committed
created a tempotary controller for stations_map will delete later

nmohamed54321
authored and
mariaigartua
committed
Ruby added these files after i generated the stationmap controller

nmohamed54321
authored and
mariaigartua
committed
created the view page for the map

nmohamed54321
authored and
mariaigartua
committed
added the stationmap routes to the routes file

nmohamed54321
authored and
mariaigartua
committed
tried moving the map to the left but didnt work

nmohamed54321
authored and
mariaigartua
committed
deleted some methods

nmohamed54321
authored and
mariaigartua
committed
added few more code to try displaying image on the map

nmohamed54321
authored and
mariaigartua
committed
Created Card Class
mariaigartua
committed
Update Main View and other views
mariaigartua
committed
Added FAQ to the welcome page view
mariaigartua
committed
adjusted routes

mneedham01
authored and
mariaigartua
committed
Updated Main Page View
mariaigartua
committed
Created Bike class and getters
mariaigartua
committed
Updated Trips View
mariaigartua
committed
im trying to pull stations
mariaigartua
committed
info about bike/station class

nmohamed54321
authored and
mariaigartua
committed
Updated the has_many/belongs_to relationship between the bikes and stations to match by the station identifier rather than the station id to correctly ensure the database matches the csv file

jaltamiranobello
authored and
mariaigartua
committed
Generated new Trips controller

mneedham01
authored and
mariaigartua
committed
created new payment controller

mneedham01
authored and
mariaigartua
committed
configured routes; deleted create view file

mneedham01
authored and
mariaigartua
committed
added in code for $5.00 subscription form

mneedham01
authored and
mariaigartua
committed
added create, successes, and cancel code to the payments controller

mneedham01
authored and
mariaigartua
committed
added publishable and secret keys as variables not as the actual keys lol

mneedham01
authored and
mariaigartua
committed
"Updated trip model to have users instaed of customers. Worked on create method in new TripsController."

mmartin-smith
authored and
mariaigartua
committed
modify create method to work with new rent bike veiw

mmartin-smith
authored and
mariaigartua
committed
added placeholder crud functions for payment

mneedham01
authored and
mariaigartua
committed
create placeholder views for new and edit

mneedham01
authored and
mariaigartua
committed
Testing commit to publish branch for others access

jaltamiranobello
authored and
mariaigartua
committed
intial steps on updating the trip controller

nmohamed54321
authored and
mariaigartua
committed
updating the trip controller to use the crud functions instead

nmohamed54321
authored and
mariaigartua
committed
created payments controller, new and edit placeholder views, and edited routes file

mneedham01
authored and
mariaigartua
committed
added comments to payments controller and views

mneedham01
authored and
mariaigartua
committed
Created Bike class and getters
mariaigartua
committed
added the rental path so that when a bike is rent the button takes the user to the rent page

nmohamed54321
authored and
mariaigartua
committed
added the right path to the view

nmohamed54321
authored and
mariaigartua
committed
added the relationships to the models

nmohamed54321
authored and
mariaigartua
committed
removed duplicate files

nmohamed54321
authored and
mariaigartua
committed
Removed the book a ride button since parameters are required and users need to select a bike first

jaltamiranobello
authored and
mariaigartua
committed
function to find the current station that a user rented a bike from

nmohamed54321
authored and
mariaigartua
committed
Form to display the trip history of a user

nmohamed54321
authored and
mariaigartua
committed
schema.rb update
mariaigartua
committed
Created Bike class and getters
mariaigartua
committed
Updated Trips View
mariaigartua
committed
info about bike/station class

nmohamed54321
authored and
mariaigartua
committed
Updated the has_many/belongs_to relationship between the bikes and stations to match by the station identifier rather than the station id to correctly ensure the database matches the csv file

jaltamiranobello
authored and
mariaigartua
committed
Included the stations/index route

jaltamiranobello
authored and
mariaigartua
committed