Skip to content
Open

Maria #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
275 commits
Select commit Hold shift + click to select a range
79cb473
Created Bike class and getters
mariaigartua Nov 2, 2024
84f7636
Deleted get_battery_percentage
mneedham01 Nov 2, 2024
e1e5bd3
Updated Bike class and getters
mariaigartua Nov 2, 2024
505d858
Merge pull request #11 from jaltamiranobello/maria
mneedham01 Nov 2, 2024
11e5a2c
Made controllers for trip and customer. Added stub methods for trip c…
mmartin-smith Nov 3, 2024
5a0f6b6
Created Card Class
mariaigartua Nov 5, 2024
b1fa241
Created Card Class
mariaigartua Nov 5, 2024
9a2cb18
Created Card Class
mariaigartua Nov 5, 2024
237a48a
Merge pull request #12 from jaltamiranobello/maria
mariaigartua Nov 5, 2024
077f8a7
delted user related classes to use devise
jaltamiranobello Nov 7, 2024
efdf474
added station.rb because accidental deletion
jaltamiranobello Nov 7, 2024
ec98fcc
Created Home Controller to set up devise
jaltamiranobello Nov 7, 2024
7743ad6
Added Welcome message to home index view
jaltamiranobello Nov 7, 2024
a8e4959
Mistype the word welcome
jaltamiranobello Nov 7, 2024
3a319ae
Added gem devise
jaltamiranobello Nov 7, 2024
fa40d8c
Installed devise files
jaltamiranobello Nov 7, 2024
71c8f9b
Added turbo stream as navigational format
jaltamiranobello Nov 7, 2024
062ce58
Added notice and alert tags
jaltamiranobello Nov 7, 2024
0e9d8cf
Created User model via devise method
jaltamiranobello Nov 7, 2024
ce7704e
Deleted old User migration NOT devise method
jaltamiranobello Nov 7, 2024
bd8d7a3
deleted old routing for manual User controller
jaltamiranobello Nov 7, 2024
49b59af
Updated db to include devise user db
jaltamiranobello Nov 7, 2024
dd86a65
Devise code that checks user login status
jaltamiranobello Nov 7, 2024
32e0fe6
adjusted database
mneedham01 Nov 8, 2024
4223e12
created "main" action and rerouted this to be homepage
mneedham01 Nov 8, 2024
962c3bf
added pseudocode to main view page
mneedham01 Nov 8, 2024
ac0b067
ran "rails generate devise:views" to generate the files for the views…
mneedham01 Nov 8, 2024
725fa99
filled in code for main view page
mneedham01 Nov 8, 2024
dc996db
got rid of "Log in" as a shared link
mneedham01 Nov 8, 2024
14c2858
restored shared links, deleted shared links off of "sign up" page
mneedham01 Nov 8, 2024
005e3c3
Customized Sign Up Page
mneedham01 Nov 8, 2024
afccef5
commented out "sign up" link
mneedham01 Nov 8, 2024
cfd657b
Replaced buttons (still don't know why the routes weren't working for…
mneedham01 Nov 8, 2024
5c35072
created a Users controller in order to add "show" action to display u…
mneedham01 Nov 8, 2024
7f1eaad
Edited "show" route
mneedham01 Nov 8, 2024
d11be6b
Rearranged main page
mneedham01 Nov 8, 2024
15eac13
Added "sign out" button
mneedham01 Nov 8, 2024
bfe100b
Added my name to README
mariaigartua Nov 1, 2024
da33a12
Added my name to README
mariaigartua Nov 2, 2024
c037cb3
Created Bike class and getters
mariaigartua Nov 2, 2024
50e0f3c
Deleted get_battery_percentage
mneedham01 Nov 2, 2024
57a8936
Updated Bike class and getters
mariaigartua Nov 2, 2024
6729399
Created Card Class
mariaigartua Nov 5, 2024
cf9baad
Created Card Class
mariaigartua Nov 5, 2024
49b83e4
Created Card Class
mariaigartua Nov 5, 2024
5826c97
Created Home Controller to set up devise
jaltamiranobello Nov 7, 2024
1c3a8d8
Created User model via devise method
jaltamiranobello Nov 7, 2024
4efb4d6
deleted old routing for manual User controller
jaltamiranobello Nov 7, 2024
3844d43
deleted repeate devise_for: users
jaltamiranobello Nov 8, 2024
7d2123e
Changed the default page to maggie's homepage changes
jaltamiranobello Nov 9, 2024
a315f17
deleted "Forgot Your Password" option from shared links
mneedham01 Nov 9, 2024
b47bc9e
added firstName and lastName fields to users
mneedham01 Nov 9, 2024
5bc2cd9
added fields in sign up form
mneedham01 Nov 9, 2024
32ef09f
Added firstName to Welcome message
mneedham01 Nov 9, 2024
786255b
Added first name and last name to account info page
mneedham01 Nov 9, 2024
417b576
updated first name and last name migration to user database
jaltamiranobello Nov 9, 2024
9ec8139
Pared down "Edit Account Information" page
mneedham01 Nov 9, 2024
0b12e2d
Added application controller code that allows firstname and lastname …
mneedham01 Nov 9, 2024
24d35c8
Formatted First and Last Name labels on user sign up
mneedham01 Nov 9, 2024
9d94d43
Added Link to "Back" in "Account Information" page
mneedham01 Nov 9, 2024
66e9a42
Added Northampton Google Maps Image as a placeholder
mneedham01 Nov 9, 2024
cb695a1
Added label for map
mneedham01 Nov 9, 2024
7b27023
Creates images folder and added the brand logo
jaltamiranobello Nov 10, 2024
70a15eb
Styled Hompage with new information and text color and fonts
jaltamiranobello Nov 10, 2024
42b01e2
added .ico version of the image to images
jaltamiranobello Nov 10, 2024
24de77e
Changed color output for all section title class objects in html
jaltamiranobello Nov 10, 2024
f2d0862
Created Welcome Page Layout
mariaigartua Nov 10, 2024
46c0b9b
got rid of <li> links causing bullet points on login and get started …
mneedham01 Nov 10, 2024
cd8f2a0
Added my name to README
mariaigartua Nov 1, 2024
2d59670
Added my name to README
mariaigartua Nov 2, 2024
f40b10d
Created Bike class and getters
mariaigartua Nov 2, 2024
15eafef
Deleted get_battery_percentage
mneedham01 Nov 2, 2024
c6da7f8
Updated Bike class and getters
mariaigartua Nov 2, 2024
ac3521c
Created Card Class
mariaigartua Nov 5, 2024
d8c9450
Created Card Class
mariaigartua Nov 5, 2024
99b482d
Created Card Class
mariaigartua Nov 5, 2024
2ead906
Created trip and customer model. Added all model relations required f…
mmartin-smith Nov 3, 2024
c508efe
Added basic pages in the trip view and put some basic formatting in. …
mmartin-smith Nov 10, 2024
976d3ff
Commented out "remember me"
mneedham01 Nov 10, 2024
3faf026
adjusted buttons
mneedham01 Nov 10, 2024
71912cf
Updated the css layout of the register page
jaltamiranobello Nov 11, 2024
405a680
Updated layout to make user input visible; previously white text
jaltamiranobello Nov 12, 2024
e3aa477
Centered the registration form
jaltamiranobello Nov 12, 2024
204190e
Center sign up to full screen
jaltamiranobello Nov 12, 2024
0b5ab06
Added image for registration/signUp page
jaltamiranobello Nov 12, 2024
a43abbe
Updated layout of registartion page to inlcude image and reformat the…
jaltamiranobello Nov 12, 2024
534ccb0
Included image in registartion page
jaltamiranobello Nov 12, 2024
7702443
Added first name and last name as text fields in account settings; do…
jaltamiranobello Nov 12, 2024
b5a1e61
Comment Syntax Error; all account setting fields now present
jaltamiranobello Nov 12, 2024
6b20c0f
Allowed parameters firstName and lastName to allow user database to u…
jaltamiranobello Nov 12, 2024
f5e7e1c
Added Header to Registration Page
jaltamiranobello Nov 12, 2024
73cc4a8
Updated instructions for user to edit their registration data
jaltamiranobello Nov 14, 2024
9b39765
Added missing closing bracket
jaltamiranobello Nov 14, 2024
5a79cd3
Updated Layout of the user's Account & Information Page
jaltamiranobello Nov 14, 2024
3977f2b
Built out trip functionality, including start_trip and end_trip methods.
mmartin-smith Nov 16, 2024
818d0a3
redirected the link of "My account info" to go to the Account & Setti…
jaltamiranobello Nov 16, 2024
a38cf7f
Created Bike class and getters
mariaigartua Nov 2, 2024
2480581
Created Card Class
mariaigartua Nov 5, 2024
b1ca687
Your commit message describing the changes
mariaigartua Nov 16, 2024
1a24de8
Update Main View and other views
mariaigartua Nov 16, 2024
86d5020
Created Bike class and getters
mariaigartua Nov 2, 2024
95defe0
Created Card Class
mariaigartua Nov 5, 2024
086b1d5
Created User model via devise method
jaltamiranobello Nov 7, 2024
b0bfda3
created a Users controller in order to add "show" action to display u…
mneedham01 Nov 8, 2024
b0a006a
Created Card Class
mariaigartua Nov 5, 2024
5004f3b
Sign In View, Updated Welcome Page View
mariaigartua Nov 16, 2024
9a34763
Fixed error in account and setting page after merging with Maria's ch…
jaltamiranobello Nov 16, 2024
1497abb
Updated the "My Account Info" link to render the account and settings…
jaltamiranobello Nov 16, 2024
8d6d242
Merge branch 'devise' into Mackenzie
jaltamiranobello Nov 16, 2024
723c035
Merge pull request #13 from jaltamiranobello/Mackenzie
jaltamiranobello Nov 16, 2024
42b4e3d
Ran migration to update with mackenzie's trip changes
jaltamiranobello Nov 16, 2024
b283647
Updated Main Page View
mariaigartua Nov 16, 2024
5497f72
Rerouted the My account button to go to the account and settings page
jaltamiranobello Nov 16, 2024
a5bd6cd
Removed instances of old User Contoller to avoid merge errors when we…
jaltamiranobello Nov 17, 2024
4077d17
Removed all instances from user data base to avoid merge conflicts wh…
jaltamiranobello Nov 17, 2024
2dfa656
Removed all instances from user data base to avoid merge conflicts wh…
jaltamiranobello Nov 17, 2024
13109dd
Removed instances of old User Contoller to avoid merge errors when we…
jaltamiranobello Nov 17, 2024
c360184
Added the devise updates in schema
jaltamiranobello Nov 17, 2024
a58a7c8
Merge pull request #15 from jaltamiranobello/devise
jaltamiranobello Nov 17, 2024
67baff1
Merge branch 'devise' into maria
mariaigartua Nov 19, 2024
b9acea0
Added FAQ to the welcome page view
mariaigartua Nov 19, 2024
64078d7
initalized stripe installment
mneedham01 Nov 10, 2024
af1e001
create a stripe payment method in home
mneedham01 Nov 10, 2024
edbdbd4
create payment controller
mneedham01 Nov 10, 2024
72481c3
created a new method
mneedham01 Nov 10, 2024
07bf82b
adjusted routes
mneedham01 Nov 10, 2024
2e2ce9f
Merging payment into mackenzie
mariaigartua Nov 1, 2024
06ea627
Added my name to README
mariaigartua Nov 2, 2024
0ad284a
Created trip and customer model. Added all model relations required f…
mmartin-smith Nov 3, 2024
b199315
Added basic pages in the trip view and put some basic formatting in. …
mmartin-smith Nov 10, 2024
c559dce
Built out trip functionality, including start_trip and end_trip methods.
mmartin-smith Nov 16, 2024
6f743f9
Created Bike class and getters
mariaigartua Nov 2, 2024
2905625
Updated Main Page View
mariaigartua Nov 16, 2024
27bf925
Created Bike class and getters
mariaigartua Nov 2, 2024
e84014f
Created Card Class
mariaigartua Nov 5, 2024
956efd0
Pulling payment into branch Mackenzie
mmartin-smith Nov 21, 2024
53fc380
updated link to "my account" on main page to the devise users, not u…
mneedham01 Nov 21, 2024
7ad634a
added "new" and "create" methods to trip class; renamed "book" view p…
mneedham01 Nov 21, 2024
7801659
I don't even know. The only change is one extra empty line in schema.rb.
mmartin-smith Nov 21, 2024
16ef328
changed routes file to add new routes for CRUD verbs
mneedham01 Nov 21, 2024
3e8b02a
deleted all trip-related code
mneedham01 Nov 22, 2024
c831252
Generated new Trips controller
mneedham01 Nov 22, 2024
df397df
added resourceful routes
mneedham01 Nov 22, 2024
d304b07
added back trip model file
mneedham01 Nov 22, 2024
a033f72
added back in code for new trip form; deleted create view (unnecessary)
mneedham01 Nov 22, 2024
d554851
updated form
mneedham01 Nov 22, 2024
d73eada
added in code from task helper example; changed form to directly link…
mneedham01 Nov 22, 2024
2bb99fe
deleted link to new trip
mneedham01 Nov 22, 2024
f7a88d2
Created Bike class and getters
mariaigartua Nov 2, 2024
64e4251
Created Card Class
mariaigartua Nov 5, 2024
d2d14b0
Update Main View and other views
mariaigartua Nov 16, 2024
a43a547
Added FAQ to the welcome page view
mariaigartua Nov 19, 2024
7fe0cc0
Updated Trips View
mariaigartua Nov 27, 2024
0b7c198
info about bike/station class
nmohamed54321 Nov 10, 2024
e68f79b
created a rake file to read the bikes
nmohamed54321 Nov 21, 2024
e08d4cb
started the rake file for stations
nmohamed54321 Nov 21, 2024
1f24c98
read in the csv for station to create rake database
nmohamed54321 Nov 21, 2024
82f1e22
Completed the rake task to read in the database also updated the data…
nmohamed54321 Nov 21, 2024
bac59fa
Added more css to manipulate the view for the stations and bikes
nmohamed54321 Nov 22, 2024
6290004
Previous on Added more css to manipulate the view for the stations an…
nmohamed54321 Nov 22, 2024
08ec745
Added the bike methods in the controller class
nmohamed54321 Nov 22, 2024
bdeada2
Added the station methods in the controller class
nmohamed54321 Nov 22, 2024
997e32e
Created a partial for the bike
nmohamed54321 Nov 22, 2024
e11437e
deleted the view pages called delete and new
nmohamed54321 Nov 22, 2024
8b1e83a
Added the needed code in the index file to call the partial and displ…
nmohamed54321 Nov 22, 2024
d0a8aa9
Added the needed code for the show page of the stations so that it di…
nmohamed54321 Nov 22, 2024
b257bc9
Just deleted something I added for testing hhhh
nmohamed54321 Nov 22, 2024
2e78eb7
added css and stwiched the locations of some
nmohamed54321 Nov 22, 2024
30aa2ad
Fixed the writing in how it appeared on the view
nmohamed54321 Nov 22, 2024
f81c226
Testing purposes for now. but i think i might delete this page later
nmohamed54321 Nov 22, 2024
0c0e45c
I have to fix something in this page later today. you can pull it if …
nmohamed54321 Nov 22, 2024
dfb3627
added br tag and got rid of some unnessecary stuff
nmohamed54321 Nov 22, 2024
5408603
Changed the name at the end
nmohamed54321 Nov 22, 2024
7d24bcd
There is no bug, but will modify this so that it displays all the bik…
nmohamed54321 Nov 22, 2024
da79766
Created header for the station index page
nmohamed54321 Nov 22, 2024
453958c
updated to show the station by the identifier
nmohamed54321 Nov 22, 2024
da40d22
Made CSS classes for to create the header for the stations index page
nmohamed54321 Nov 22, 2024
42736c1
Added the css for the buttons, but they are responsive to on click wi…
nmohamed54321 Nov 23, 2024
3b7a97f
Added a p tag
nmohamed54321 Nov 23, 2024
e91af84
fixes the text on the view
nmohamed54321 Nov 23, 2024
50e2ec3
Updated nio4r package
jaltamiranobello Nov 23, 2024
c33c88e
Updated the bikes to correctly match the stations based on the identi…
nmohamed54321 Nov 23, 2024
eb7ba73
Updated the has_many/belongs_to relationship between the bikes and st…
jaltamiranobello Nov 25, 2024
b690cc2
Added formatted header for the view bike inventory page
jaltamiranobello Nov 25, 2024
50d88f3
added more css for button reactions
nmohamed54321 Nov 25, 2024
53e6954
added a button show
nmohamed54321 Nov 25, 2024
343aad9
added a link back to the stations
nmohamed54321 Nov 25, 2024
2a7004f
Created button/updated format in the view bike inventory to return to…
jaltamiranobello Nov 26, 2024
ea8e3ce
Added a button that will later connect to the start trip path
jaltamiranobello Nov 26, 2024
9c706ac
Updated the button in the view stations to render the inventory of th…
jaltamiranobello Nov 26, 2024
40f3720
Included the stations/index route
jaltamiranobello Nov 26, 2024
9db10b4
First commit in stations branch
jaltamiranobello Nov 21, 2024
4ce8481
Created rake task to read in the station csv file into the database
jaltamiranobello Nov 23, 2024
6b2625e
Removed extra bike controller
jaltamiranobello Nov 26, 2024
e75299e
included old bike methods in one controller to not delete any old fun…
jaltamiranobello Nov 26, 2024
9a68f3e
Fixed syntax errors in the css page
jaltamiranobello Nov 26, 2024
b148109
Updated error in the css page to properly render the station and bike…
jaltamiranobello Nov 26, 2024
7113cb0
Added button in main page to allow users to view the station and bike…
jaltamiranobello Nov 26, 2024
7177a3f
Added button so user's can return to the main homepage with the map f…
jaltamiranobello Nov 26, 2024
b400790
Added a button so users can return to the main homepage with the map …
jaltamiranobello Nov 26, 2024
0ed6b5c
Added manual google maps with pin points of stations
jaltamiranobello Nov 26, 2024
c6da22f
Formatted the title view stations
jaltamiranobello Nov 26, 2024
3056b4c
Updated map to have the stations points
jaltamiranobello Nov 26, 2024
5d5221a
added css for the map
nmohamed54321 Nov 27, 2024
25a15b5
created a tempotary controller for stations_map will delete later
nmohamed54321 Nov 27, 2024
e52bb4c
Ruby added these files after i generated the stationmap controller
nmohamed54321 Nov 27, 2024
9121d0e
created the view page for the map
nmohamed54321 Nov 27, 2024
660d720
added the stationmap routes to the routes file
nmohamed54321 Nov 27, 2024
3e0752a
tried moving the map to the left but didnt work
nmohamed54321 Nov 28, 2024
8fce8e8
deleted some methods
nmohamed54321 Nov 28, 2024
38dc893
added few more code to try displaying image on the map
nmohamed54321 Nov 28, 2024
0b912e6
Created Card Class
mariaigartua Nov 5, 2024
09f0390
Update Main View and other views
mariaigartua Nov 16, 2024
d348002
Added FAQ to the welcome page view
mariaigartua Nov 19, 2024
eff7d88
adjusted routes
mneedham01 Nov 10, 2024
a36ff4e
Updated Main Page View
mariaigartua Nov 16, 2024
5f64ac0
Created Bike class and getters
mariaigartua Nov 2, 2024
0371a7d
Updated Trips View
mariaigartua Nov 27, 2024
4057e98
im trying to pull stations
mariaigartua Dec 3, 2024
53365bb
info about bike/station class
nmohamed54321 Nov 10, 2024
03192ce
Updated the has_many/belongs_to relationship between the bikes and st…
jaltamiranobello Nov 25, 2024
60e43e8
Generated new Trips controller
mneedham01 Nov 22, 2024
70a928c
created new payment controller
mneedham01 Nov 22, 2024
ac73247
configured routes; deleted create view file
mneedham01 Nov 22, 2024
e58b073
added in code for $5.00 subscription form
mneedham01 Nov 22, 2024
003b146
added create, successes, and cancel code to the payments controller
mneedham01 Nov 22, 2024
a3b15b9
added publishable and secret keys as variables not as the actual keys…
mneedham01 Nov 22, 2024
e790150
"Updated trip model to have users instaed of customers. Worked on cre…
mmartin-smith Nov 22, 2024
2dca1d0
modify create method to work with new rent bike veiw
mmartin-smith Nov 24, 2024
edcf2bf
added placeholder crud functions for payment
mneedham01 Nov 28, 2024
dfac289
create placeholder views for new and edit
mneedham01 Nov 28, 2024
4dee6f7
Testing commit to publish branch for others access
jaltamiranobello Nov 27, 2024
dc96100
intial steps on updating the trip controller
nmohamed54321 Nov 27, 2024
888349e
updating the trip controller to use the crud functions instead
nmohamed54321 Nov 27, 2024
1ba1051
created payments controller, new and edit placeholder views, and edit…
mneedham01 Nov 28, 2024
9dadee6
added comments to payments controller and views
mneedham01 Nov 28, 2024
46f70a2
Created Bike class and getters
mariaigartua Nov 2, 2024
843944e
added the rental path so that when a bike is rent the button takes th…
nmohamed54321 Nov 28, 2024
7828c49
added the right path to the view
nmohamed54321 Nov 28, 2024
17038af
added the relationships to the models
nmohamed54321 Nov 29, 2024
e07e865
removed duplicate files
nmohamed54321 Nov 29, 2024
dbcee7f
Removed the book a ride button since parameters are required and user…
jaltamiranobello Nov 29, 2024
819c9cd
function to find the current station that a user rented a bike from
nmohamed54321 Dec 3, 2024
c35232d
Form to display the trip history of a user
nmohamed54321 Dec 3, 2024
0ea7d3f
schema.rb update
mariaigartua Dec 3, 2024
1c3942e
Created Bike class and getters
mariaigartua Nov 2, 2024
2e7054f
Updated Trips View
mariaigartua Nov 27, 2024
e289c3e
info about bike/station class
nmohamed54321 Nov 10, 2024
d02fb98
Updated the has_many/belongs_to relationship between the bikes and st…
jaltamiranobello Nov 25, 2024
6843f60
Included the stations/index route
jaltamiranobello Nov 26, 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
21 changes: 21 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "rdbg",
"name": "Debug current file with rdbg",
"request": "launch",
"script": "${file}",
"args": [],
"askParameters": true
},
{
"type": "rdbg",
"name": "Attach with rdbg",
"request": "attach"
}
]
}
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ gem "bootsnap", require: false
# Use Sass to process CSS
# gem "sassc-rails"

#Added gem devise to set up users
gem "devise"

# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2"

Expand Down Expand Up @@ -75,11 +78,12 @@ group :test do
end

# Developer Added Gems
gem 'dotenv-rails'
gem 'dotenv-rails', :groups => [:development, :test]

# Suggested Potentially Useful Gems
# gem 'devise'
# gem 'httparty'
# gem 'paperclip
# gem 'uniquify'
# gem 'will_paginate'
gem "stripe"
Loading