MVP Review: Nameless(Group C)#310

Open

jaltamiranobello wants to merge 507 commits intodeadroxy:masterfrom

jaltamiranobello:prototype

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

Commits on Nov 26, 2024

Updated the button in the view stations to render the inventory of the current instance varaible of station which displays the bike inventory
jaltamiranobello
committed
Included the stations/index route
jaltamiranobello
committed
Merge branch 'stations' into nmohamed
jaltamiranobello
authored
Merge pull request #16 from jaltamiranobello/nmohamed
jaltamiranobello
authored
Ran migrations to run server
jaltamiranobello
committed
Removed extra bike controller
jaltamiranobello
committed
included old bike methods in one controller to not delete any old functionality if needed
jaltamiranobello
committed
Fixed syntax errors in the css page
jaltamiranobello
committed
Updated error in the css page to properly render the station and bikes inventory views
jaltamiranobello
committed
Added button in main page to allow users to view the station and bike inventory from the home page
jaltamiranobello
committed
Added button so user's can return to the main homepage with the map from the account & settings page
jaltamiranobello
committed
Added a button so users can return to the main homepage with the map view after viewing the stations
jaltamiranobello
committed
Added manual google maps with pin points of stations
jaltamiranobello
committed
Formatted the title view stations
jaltamiranobello
committed
Updated map to have the stations points
jaltamiranobello
committed

Commits on Nov 27, 2024

Commits on Nov 28, 2024

info about bike/station class

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

nmohamed54321
authored and
mneedham01
committed
started the rake file for stations

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

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

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

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

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

nmohamed54321
authored and
mneedham01
committed
Created a partial for the bike

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

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

nmohamed54321
authored and
mneedham01
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
mneedham01
committed
Just deleted something I added for testing hhhh

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

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

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

nmohamed54321
authored and
mneedham01
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
mneedham01
committed
added br tag and got rid of some unnessecary stuff

nmohamed54321
authored and
mneedham01
committed
Changed the name at the end

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

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

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

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

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

nmohamed54321
authored and
mneedham01
committed
Added a p tag

nmohamed54321
authored and
mneedham01
committed
fixes the text on the view

nmohamed54321
authored and
mneedham01
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
mneedham01
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
mneedham01
committed
Added formatted header for the view bike inventory page

jaltamiranobello
authored and
mneedham01
committed
added more css for button reactions

nmohamed54321
authored and
mneedham01
committed
added a button show

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

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

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

jaltamiranobello
authored and
mneedham01
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
mneedham01
committed
Included the stations/index route

jaltamiranobello
authored and
mneedham01
committed
Made controllers for trip and customer. Added stub methods for trip class.

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

mariaigartua
authored and
mneedham01
committed
Added my name to README

mariaigartua
authored and
mneedham01
committed
Created Bike class and getters

mariaigartua
authored and
mneedham01
committed
Deleted get_battery_percentage
mneedham01
committed
Updated Bike class and getters

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
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
mneedham01
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
mneedham01
committed
Built out trip functionality, including start_trip and end_trip methods.

mmartin-smith
authored and
mneedham01
committed
Updated the css layout of the register page

jaltamiranobello
authored and
mneedham01
committed
Updated layout to make user input visible; previously white text

jaltamiranobello
authored and
mneedham01
committed
Centered the registration form

jaltamiranobello
authored and
mneedham01
committed
Center sign up to full screen

jaltamiranobello
authored and
mneedham01
committed
Added image for registration/signUp page

jaltamiranobello
authored and
mneedham01
committed
Updated layout of registartion page to inlcude image and reformat the form for user input

jaltamiranobello
authored and
mneedham01
committed
Included image in registartion page

jaltamiranobello
authored and
mneedham01
committed
Added first name and last name as text fields in account settings; doesn't actually update database yet

jaltamiranobello
authored and
mneedham01
committed
Comment Syntax Error; all account setting fields now present

jaltamiranobello
authored and
mneedham01
committed
Allowed parameters firstName and lastName to allow user database to update those values from the edit user information view

jaltamiranobello
authored and
mneedham01
committed
Added Header to Registration Page

jaltamiranobello
authored and
mneedham01
committed
Updated instructions for user to edit their registration data

jaltamiranobello
authored and
mneedham01
committed
Added missing closing bracket

jaltamiranobello
authored and
mneedham01
committed
Updated Layout of the user's Account & Information Page

jaltamiranobello
authored and
mneedham01
committed
redirected the link of "My account info" to go to the Account & Settings page rather than having a filler in page with repetiive information

jaltamiranobello
authored and
mneedham01
committed
Created Bike class and getters

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Created User model via devise method

jaltamiranobello
authored and
mneedham01
committed
created a Users controller in order to add "show" action to display user info; this is linked on main page
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Sign In View, Updated Welcome Page View

mariaigartua
authored and
mneedham01
committed
Fixed error in account and setting page after merging with Maria's changed

jaltamiranobello
authored and
mneedham01
committed
Updated the "My Account Info" link to render the account and settings page rather than the filler in between page with redundacies

jaltamiranobello
authored and
mneedham01
committed
Ran migration to update with mackenzie's trip changes

jaltamiranobello
authored and
mneedham01
committed
Updated Main Page View

mariaigartua
authored and
mneedham01
committed
Rerouted the My account button to go to the account and settings page

jaltamiranobello
authored and
mneedham01
committed
Removed all instances from user data base to avoid merge conflicts when pulling from the devise branch

jaltamiranobello
authored and
mneedham01
committed
Removed instances of old User Contoller to avoid merge errors when we pull the updated from Devise branch

jaltamiranobello
authored and
mneedham01
committed
Added my name to README

mariaigartua
authored and
mneedham01
committed
Added my name to README

mariaigartua
authored and
mneedham01
committed
Created Bike class and getters

mariaigartua
authored and
mneedham01
committed
Deleted get_battery_percentage
mneedham01
committed
Updated Bike class and getters

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Created Card Class

mariaigartua
authored and
mneedham01
committed
Removed instances of old User Contoller to avoid merge errors when we pull the updated from Devise branch

jaltamiranobello
authored and
mneedham01
committed
Removed all instances from user data base to avoid merge conflicts when pulling from the devise branch

jaltamiranobello
authored and
mneedham01
committed
First commit in stations branch

jaltamiranobello
authored and
mneedham01
committed
Ran migrations to run server

jaltamiranobello
authored and
mneedham01
committed
Removed extra bike controller

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

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

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

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

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

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

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

jaltamiranobello
authored and
mneedham01
committed
Formatted the title view stations

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

jaltamiranobello
authored and
mneedham01
committed
added css for the map

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

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

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

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

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

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

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

nmohamed54321
authored and
mneedham01
committed
adjusted routes
mneedham01
committed
added placeholder crud functions for payment
mneedham01
committed
create placeholder views for new and edit
mneedham01
committed
created payments controller, new and edit placeholder views, and edited routes file
mneedham01
committed
added comments to payments controller and views
mneedham01
committed
added resourceful routes for stations
mneedham01
committed
updated stations model
mneedham01
committed
updated bike model
mneedham01
committed
added the missing routes
nmohamed54321
committed
Merge branch 'trips' of https://github.com/jaltamiranobello/valetbike into rental
nmohamed54321
committed
testing purposes
nmohamed54321
committed
Merge branch 'maria' of https://github.com/jaltamiranobello/valetbike into rental
nmohamed54321
committed
added the rental path so that when a bike is rent the button takes the user to the rent page
nmohamed54321
committed
added the right path to the view
nmohamed54321
committed
added new routes to make the code run
nmohamed54321
committed

Commits on Dec 3, 2024

Commits on Dec 5, 2024

Commits on Dec 6, 2024

Commits on Dec 9, 2024

Deleted old bugs
jaltamiranobello
committed