Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
507 commits
Select commit Hold shift + click to select a range
267dc1b
Updated the button in the view stations to render the inventory of th…
jaltamiranobello Nov 26, 2024
ca247e6
Included the stations/index route
jaltamiranobello Nov 26, 2024
424a3ec
Merge branch 'stations' into nmohamed
jaltamiranobello Nov 26, 2024
77a741b
Merge pull request #16 from jaltamiranobello/nmohamed
jaltamiranobello Nov 26, 2024
4487f40
Ran migrations to run server
jaltamiranobello Nov 26, 2024
a3c88d8
Removed extra bike controller
jaltamiranobello Nov 26, 2024
58dc5fe
included old bike methods in one controller to not delete any old fun…
jaltamiranobello Nov 26, 2024
92b47c3
Fixed syntax errors in the css page
jaltamiranobello Nov 26, 2024
274c7c5
Updated error in the css page to properly render the station and bike…
jaltamiranobello Nov 26, 2024
3bf8102
Added button in main page to allow users to view the station and bike…
jaltamiranobello Nov 26, 2024
687607d
Added button so user's can return to the main homepage with the map f…
jaltamiranobello Nov 26, 2024
bbcec95
Added a button so users can return to the main homepage with the map …
jaltamiranobello Nov 26, 2024
2b21fcc
Added manual google maps with pin points of stations
jaltamiranobello Nov 26, 2024
26b9bcb
Formatted the title view stations
jaltamiranobello Nov 26, 2024
3c6df96
Updated map to have the stations points
jaltamiranobello Nov 26, 2024
c01469d
added css for the map
nmohamed54321 Nov 27, 2024
d75ffc3
created a tempotary controller for stations_map will delete later
nmohamed54321 Nov 27, 2024
b8e81f8
Ruby added these files after i generated the stationmap controller
nmohamed54321 Nov 27, 2024
d7904e6
created the view page for the map
nmohamed54321 Nov 27, 2024
a15a3f3
added the stationmap routes to the routes file
nmohamed54321 Nov 27, 2024
bd67ce5
Testing commit to publish branch for others access
jaltamiranobello Nov 27, 2024
4ede17c
intial steps on updating the trip controller
nmohamed54321 Nov 27, 2024
7fe0cc0
Updated Trips View
mariaigartua Nov 27, 2024
e632d19
updating the trip controller to use the crud functions instead
nmohamed54321 Nov 27, 2024
6de7b41
info about bike/station class
nmohamed54321 Nov 10, 2024
ffd9dec
created a rake file to read the bikes
nmohamed54321 Nov 21, 2024
f0402b3
started the rake file for stations
nmohamed54321 Nov 21, 2024
d3d42de
read in the csv for station to create rake database
nmohamed54321 Nov 21, 2024
39f64a6
Completed the rake task to read in the database also updated the data…
nmohamed54321 Nov 21, 2024
73ecab2
Added more css to manipulate the view for the stations and bikes
nmohamed54321 Nov 22, 2024
8c46e7c
Added the bike methods in the controller class
nmohamed54321 Nov 22, 2024
67d5338
Added the station methods in the controller class
nmohamed54321 Nov 22, 2024
56fe248
Created a partial for the bike
nmohamed54321 Nov 22, 2024
8034040
deleted the view pages called delete and new
nmohamed54321 Nov 22, 2024
cf3032d
Added the needed code in the index file to call the partial and displ…
nmohamed54321 Nov 22, 2024
15194c9
Added the needed code for the show page of the stations so that it di…
nmohamed54321 Nov 22, 2024
ddaf572
Just deleted something I added for testing hhhh
nmohamed54321 Nov 22, 2024
ccb2f27
added css and stwiched the locations of some
nmohamed54321 Nov 22, 2024
9a1a3b4
Fixed the writing in how it appeared on the view
nmohamed54321 Nov 22, 2024
e2599bf
Testing purposes for now. but i think i might delete this page later
nmohamed54321 Nov 22, 2024
7470392
I have to fix something in this page later today. you can pull it if …
nmohamed54321 Nov 22, 2024
952b34c
added br tag and got rid of some unnessecary stuff
nmohamed54321 Nov 22, 2024
60c62b8
Changed the name at the end
nmohamed54321 Nov 22, 2024
abc8f33
There is no bug, but will modify this so that it displays all the bik…
nmohamed54321 Nov 22, 2024
f2322ab
Created header for the station index page
nmohamed54321 Nov 22, 2024
bef6920
updated to show the station by the identifier
nmohamed54321 Nov 22, 2024
fba9eeb
Made CSS classes for to create the header for the stations index page
nmohamed54321 Nov 22, 2024
ada9e7b
Added the css for the buttons, but they are responsive to on click wi…
nmohamed54321 Nov 23, 2024
cf2762c
Added a p tag
nmohamed54321 Nov 23, 2024
f948c9a
fixes the text on the view
nmohamed54321 Nov 23, 2024
e22be73
Updated the bikes to correctly match the stations based on the identi…
nmohamed54321 Nov 23, 2024
5a58558
Updated the has_many/belongs_to relationship between the bikes and st…
jaltamiranobello Nov 25, 2024
81e7f12
Added formatted header for the view bike inventory page
jaltamiranobello Nov 25, 2024
f508abf
added more css for button reactions
nmohamed54321 Nov 25, 2024
46e42c3
added a button show
nmohamed54321 Nov 25, 2024
2944c06
added a link back to the stations
nmohamed54321 Nov 25, 2024
43ce21e
Created button/updated format in the view bike inventory to return to…
jaltamiranobello Nov 26, 2024
ff31d17
Added a button that will later connect to the start trip path
jaltamiranobello Nov 26, 2024
3093f5c
Updated the button in the view stations to render the inventory of th…
jaltamiranobello Nov 26, 2024
8363484
Included the stations/index route
jaltamiranobello Nov 26, 2024
fded069
Made controllers for trip and customer. Added stub methods for trip c…
mmartin-smith Nov 3, 2024
b29efe1
Added my name to README
mariaigartua Nov 1, 2024
05fa79d
Added my name to README
mariaigartua Nov 2, 2024
e20f8fd
Created Bike class and getters
mariaigartua Nov 2, 2024
e16ed17
Deleted get_battery_percentage
mneedham01 Nov 2, 2024
1ec01b2
Updated Bike class and getters
mariaigartua Nov 2, 2024
f64f0cf
Created Card Class
mariaigartua Nov 5, 2024
2ffe301
Created Card Class
mariaigartua Nov 5, 2024
348150f
Created Card Class
mariaigartua Nov 5, 2024
ae41777
Created trip and customer model. Added all model relations required f…
mmartin-smith Nov 3, 2024
14ca4ed
Added basic pages in the trip view and put some basic formatting in. …
mmartin-smith Nov 10, 2024
e5b0f02
Built out trip functionality, including start_trip and end_trip methods.
mmartin-smith Nov 16, 2024
c252bd7
Updated the css layout of the register page
jaltamiranobello Nov 11, 2024
ad463df
Updated layout to make user input visible; previously white text
jaltamiranobello Nov 12, 2024
1548fe1
Centered the registration form
jaltamiranobello Nov 12, 2024
e7f389b
Center sign up to full screen
jaltamiranobello Nov 12, 2024
9041a2a
Added image for registration/signUp page
jaltamiranobello Nov 12, 2024
6bb0f54
Updated layout of registartion page to inlcude image and reformat the…
jaltamiranobello Nov 12, 2024
27924bf
Included image in registartion page
jaltamiranobello Nov 12, 2024
feb67c7
Added first name and last name as text fields in account settings; do…
jaltamiranobello Nov 12, 2024
1bfcb78
Comment Syntax Error; all account setting fields now present
jaltamiranobello Nov 12, 2024
3aeb089
Allowed parameters firstName and lastName to allow user database to u…
jaltamiranobello Nov 12, 2024
8e7a737
Added Header to Registration Page
jaltamiranobello Nov 12, 2024
fe7c8ab
Updated instructions for user to edit their registration data
jaltamiranobello Nov 14, 2024
4e08824
Added missing closing bracket
jaltamiranobello Nov 14, 2024
3a19b83
Updated Layout of the user's Account & Information Page
jaltamiranobello Nov 14, 2024
82916f8
redirected the link of "My account info" to go to the Account & Setti…
jaltamiranobello Nov 16, 2024
5d0f32d
Created Bike class and getters
mariaigartua Nov 2, 2024
5915e07
Created Card Class
mariaigartua Nov 5, 2024
2c471f9
Created User model via devise method
jaltamiranobello Nov 7, 2024
532d52e
created a Users controller in order to add "show" action to display u…
mneedham01 Nov 8, 2024
572dca1
Created Card Class
mariaigartua Nov 5, 2024
f23c308
Sign In View, Updated Welcome Page View
mariaigartua Nov 16, 2024
b7c05a8
Fixed error in account and setting page after merging with Maria's ch…
jaltamiranobello Nov 16, 2024
08721ff
Updated the "My Account Info" link to render the account and settings…
jaltamiranobello Nov 16, 2024
2aa9fd7
Ran migration to update with mackenzie's trip changes
jaltamiranobello Nov 16, 2024
4ea53ff
Updated Main Page View
mariaigartua Nov 16, 2024
3e348f2
Rerouted the My account button to go to the account and settings page
jaltamiranobello Nov 16, 2024
e24ba39
Removed all instances from user data base to avoid merge conflicts wh…
jaltamiranobello Nov 17, 2024
e82bd96
Removed instances of old User Contoller to avoid merge errors when we…
jaltamiranobello Nov 17, 2024
2bf70c1
Added my name to README
mariaigartua Nov 1, 2024
9a7ea4d
Added my name to README
mariaigartua Nov 2, 2024
db07077
Created Bike class and getters
mariaigartua Nov 2, 2024
a95e19b
Deleted get_battery_percentage
mneedham01 Nov 2, 2024
37e684b
Updated Bike class and getters
mariaigartua Nov 2, 2024
f16fd70
Created Card Class
mariaigartua Nov 5, 2024
47d9c00
Created Card Class
mariaigartua Nov 5, 2024
9b7d8eb
Created Card Class
mariaigartua Nov 5, 2024
52611d9
Removed instances of old User Contoller to avoid merge errors when we…
jaltamiranobello Nov 17, 2024
0b126ee
Removed all instances from user data base to avoid merge conflicts wh…
jaltamiranobello Nov 17, 2024
12bb710
First commit in stations branch
jaltamiranobello Nov 21, 2024
2350e95
Ran migrations to run server
jaltamiranobello Nov 26, 2024
aa13647
Removed extra bike controller
jaltamiranobello Nov 26, 2024
1b09771
included old bike methods in one controller to not delete any old fun…
jaltamiranobello Nov 26, 2024
c39a0f5
Fixed syntax errors in the css page
jaltamiranobello Nov 26, 2024
e142f89
Updated error in the css page to properly render the station and bike…
jaltamiranobello Nov 26, 2024
707e8d4
Added button in main page to allow users to view the station and bike…
jaltamiranobello Nov 26, 2024
6af03c4
Added button so user's can return to the main homepage with the map f…
jaltamiranobello Nov 26, 2024
1779ace
Added a button so users can return to the main homepage with the map …
jaltamiranobello Nov 26, 2024
e0a9296
Added manual google maps with pin points of stations
jaltamiranobello Nov 26, 2024
3ecb35e
Formatted the title view stations
jaltamiranobello Nov 26, 2024
8c38a0f
Updated map to have the stations points
jaltamiranobello Nov 26, 2024
60de942
added css for the map
nmohamed54321 Nov 27, 2024
319f65e
created a tempotary controller for stations_map will delete later
nmohamed54321 Nov 27, 2024
f36af99
Ruby added these files after i generated the stationmap controller
nmohamed54321 Nov 27, 2024
044ffea
created the view page for the map
nmohamed54321 Nov 27, 2024
16eae2a
added the stationmap routes to the routes file
nmohamed54321 Nov 27, 2024
fad71db
Testing commit to publish branch for others access
jaltamiranobello Nov 27, 2024
20d4f58
intial steps on updating the trip controller
nmohamed54321 Nov 27, 2024
9125980
updating the trip controller to use the crud functions instead
nmohamed54321 Nov 27, 2024
6da4028
adjusted routes
mneedham01 Nov 10, 2024
8de598f
added placeholder crud functions for payment
mneedham01 Nov 28, 2024
4e84784
create placeholder views for new and edit
mneedham01 Nov 28, 2024
ca346d1
created payments controller, new and edit placeholder views, and edit…
mneedham01 Nov 28, 2024
d9923ef
added comments to payments controller and views
mneedham01 Nov 28, 2024
c42f8cf
added resourceful routes for stations
mneedham01 Nov 28, 2024
498fc05
updated stations model
mneedham01 Nov 28, 2024
26ea2f6
updated bike model
mneedham01 Nov 28, 2024
5901497
added the missing routes
nmohamed54321 Nov 28, 2024
a0abea1
Merge branch 'trips' of https://github.com/jaltamiranobello/valetbike…
nmohamed54321 Nov 28, 2024
ebbf3d3
testing purposes
nmohamed54321 Nov 28, 2024
595eff9
Merge branch 'maria' of https://github.com/jaltamiranobello/valetbike…
nmohamed54321 Nov 28, 2024
c1cb08f
added the rental path so that when a bike is rent the button takes th…
nmohamed54321 Nov 28, 2024
911c105
added the right path to the view
nmohamed54321 Nov 28, 2024
08d6573
added new routes to make the code run
nmohamed54321 Nov 28, 2024
d36cde2
made the logo a link so that once it's clicked on it roots to our mai…
nmohamed54321 Nov 29, 2024
63c79af
added the relationships to the models
nmohamed54321 Nov 29, 2024
3b89071
removed duplicate files
nmohamed54321 Nov 29, 2024
c136788
deleted payment and card controllers
mneedham01 Nov 29, 2024
9316696
made new payments controller
mneedham01 Nov 29, 2024
efc72b2
Updated the trip/new page to take in a bike indentifier to display co…
jaltamiranobello Nov 29, 2024
530e7bb
Removed the book a ride button since parameters are required and user…
jaltamiranobello Nov 29, 2024
5fccae7
added code from stripe example to create function
mneedham01 Dec 1, 2024
af64c7a
added code for a form in the new view
mneedham01 Dec 1, 2024
92ec332
changed configuration key to variable
mneedham01 Dec 1, 2024
674ead5
changed to concatenating first and last name
mneedham01 Dec 1, 2024
6c653c4
added post route to access create method
mneedham01 Dec 1, 2024
3dbe2a5
created a payments model
mneedham01 Dec 3, 2024
9da43fc
create success and cancel routes
mneedham01 Dec 3, 2024
f1989bc
payment model file
mneedham01 Dec 3, 2024
7d7d71e
added a link to external stripe payment as possible option
mneedham01 Dec 3, 2024
fc6048d
function to find the current station that a user rented a bike from
nmohamed54321 Dec 3, 2024
592efd9
Form to display the trip history of a user
nmohamed54321 Dec 3, 2024
2c34f61
updated version
nmohamed54321 Dec 3, 2024
ec462de
Updated the new function
nmohamed54321 Dec 3, 2024
8a2664c
Needed trips/new in order to get the home page to render and needed r…
jaltamiranobello Dec 3, 2024
19680b7
simplfied the new function and added more code to the create function
nmohamed54321 Dec 3, 2024
5f57f8a
added javascript so that we listen to the user click on the book my r…
nmohamed54321 Dec 3, 2024
152a512
Add price column to trips model
mmartin-smith Dec 3, 2024
07d6911
updated the trips model to include the price column
jaltamiranobello Dec 3, 2024
beee1ef
Rerouted the placement link for the trips button to show the trips/in…
jaltamiranobello Dec 3, 2024
56fa029
new code for #new action that takes in a price, makes a new payment l…
mneedham01 Dec 3, 2024
aadbec3
replaced previous stripe buttons with a link to newly created payment…
mneedham01 Dec 3, 2024
ce962aa
updated success page to include a link home
mneedham01 Dec 3, 2024
e2931a8
updated payment link to be redirected to success page
mneedham01 Dec 3, 2024
a8672ea
not needed within the new method as the bike accessess the station
jaltamiranobello Dec 3, 2024
685847c
Added confirmation page that will be rendered after the trip is created
jaltamiranobello Dec 3, 2024
15d7fba
Updated the button book my bike rather than using javahx
jaltamiranobello Dec 3, 2024
a1d5a94
Redifining the create method and calling it via the book my bike butt…
jaltamiranobello Dec 4, 2024
a544fd4
Removed card migration since not needed and added parametere to the t…
jaltamiranobello Dec 4, 2024
8d79893
Updated the create method to instantiate a trip object and needed to …
jaltamiranobello Dec 4, 2024
e025105
Added information inside view to display the users trip information
jaltamiranobello Dec 4, 2024
11f3229
updated the trip create and new
nmohamed54321 Dec 5, 2024
3f1ce80
added an identifier functionality as well as allowing the trip id to …
nmohamed54321 Dec 5, 2024
8c4585f
added a line to check the time
nmohamed54321 Dec 5, 2024
6b3da5a
removed unneccessary lines of code for more clarity
nmohamed54321 Dec 5, 2024
eba4864
Added the time function to calculate the current start and end times
nmohamed54321 Dec 5, 2024
89cb1c5
called the formatted_start_time function instead of the start_time
nmohamed54321 Dec 5, 2024
9f78b54
added css for new buttons that I added to our previous buttons
nmohamed54321 Dec 5, 2024
9b3d661
deleted uncessary functions
nmohamed54321 Dec 5, 2024
1730ccd
deleted uncessary functions
nmohamed54321 Dec 5, 2024
c163fb2
added one more button to each of these partials
nmohamed54321 Dec 5, 2024
d4678e0
deleted uncessary form stuff
nmohamed54321 Dec 5, 2024
780af47
added a link to go back to the main page once we show the confirmation
nmohamed54321 Dec 5, 2024
a55cb96
Added skeleton method that will calculate the price depending on the …
jaltamiranobello Dec 5, 2024
adefd2f
Added skeleton method to calc price
jaltamiranobello Dec 5, 2024
90b0e7a
Added table for payment
mneedham01 Dec 5, 2024
bddff8c
Merge branch 'payment' into integrate_payment
mneedham01 Dec 5, 2024
1f32a47
deleted trip-related files (trips remain)
mneedham01 Dec 5, 2024
b900621
added routes for payments success and cancel
mneedham01 Dec 5, 2024
a9ef6af
added the index crud action so that we could make index view and adde…
nmohamed54321 Dec 5, 2024
bf1dc08
deleted the uncessary button for return the bike
nmohamed54321 Dec 5, 2024
c72c15d
deleted the uncessary second button
nmohamed54321 Dec 5, 2024
1f74618
added a trip partial
nmohamed54321 Dec 5, 2024
2f10062
edited the button name
nmohamed54321 Dec 5, 2024
fbe3bf1
changed the route path that we render
nmohamed54321 Dec 5, 2024
94fe979
changed the name for the link
nmohamed54321 Dec 5, 2024
2887d29
added in routes for trip crud actions
mneedham01 Dec 5, 2024
3f52a2c
Updated proper page for the viewMyAccount
jaltamiranobello Dec 5, 2024
e98abbd
Integrated the previous main page
mneedham01 Dec 5, 2024
a9c5e8c
copied over the css sheet from the rental branch
mneedham01 Dec 5, 2024
218c77d
copied over new html for devise sessions from rental branch
mneedham01 Dec 5, 2024
fedde70
changed "trip confirmation page" to show to align with CRUD for trips
mneedham01 Dec 5, 2024
d592364
changed trips#index to display all of the user's trips
mneedham01 Dec 5, 2024
ab5e6fc
added pseudocode for update and calculate price
mneedham01 Dec 5, 2024
6a0c3a9
changed the partial to link to the update_trip_path
mneedham01 Dec 5, 2024
f9aee9f
added a view for return_bike that lists the stations
mneedham01 Dec 5, 2024
06f329b
deleted old index view
mneedham01 Dec 5, 2024
3414f31
changed the "end trip" link to go to the stations list
mneedham01 Dec 5, 2024
04f7cdd
updated routes to include update_trip
mneedham01 Dec 5, 2024
f1f9576
changed schema
mneedham01 Dec 5, 2024
ad2ff9c
uncommented out the redirect line
mneedham01 Dec 5, 2024
07f30db
filled out calculate price
mneedham01 Dec 5, 2024
5524332
edited trips controller to not set the price but just calculate the p…
mneedham01 Dec 5, 2024
5f931c0
Updated the return_bike view to notify the user the select a return s…
jaltamiranobello Dec 5, 2024
11f8618
I had a missing gem so i had to do bundle install mini_portile2 (2.8.…
nmohamed54321 Dec 6, 2024
805676e
same css as before deleted new css stuff i added
nmohamed54321 Dec 6, 2024
439b478
fixed the index function so that i could display the trips, also the …
nmohamed54321 Dec 6, 2024
c26ac25
i made the bike logo to be a link to our rooth path
nmohamed54321 Dec 6, 2024
d15ed76
created the index view page to display the trip history of the user
nmohamed54321 Dec 6, 2024
3833138
removed the resource route for the trip and manually added each route
nmohamed54321 Dec 6, 2024
f89066a
Merge branch 'integrate_payment' of https://github.com/jaltamiranobel…
nmohamed54321 Dec 6, 2024
a4f0f59
I deleted the return bike function and took care of what it was suppo…
nmohamed54321 Dec 6, 2024
11e470a
renamed the returnbike html
nmohamed54321 Dec 6, 2024
9414d6c
edited the render route and added the new route
nmohamed54321 Dec 6, 2024
baa7f75
deleted this page
nmohamed54321 Dec 6, 2024
529a6b2
Trip class is completed
nmohamed54321 Dec 6, 2024
44451f5
added the end station to the trip history page
nmohamed54321 Dec 6, 2024
a5bcb83
Added comments to provide guidance to generate a price for a trip and…
jaltamiranobello Dec 6, 2024
9bc00d8
found and set trip price, sent to payments#new and dispalyed in the n…
mneedham01 Dec 7, 2024
7235d49
Created Succes Page view
mariaigartua Dec 7, 2024
785c17e
added description of the rake import stations task
jaltamiranobello Dec 7, 2024
c3558e3
Added partial formatted view to the current trip page
jaltamiranobello Dec 7, 2024
5309772
Completed views for: Payment Success Page,
mariaigartua Dec 7, 2024
4cac26b
manually merged views branch to integrate_payment
mariaigartua Dec 8, 2024
e18016a
Working ValetBike protype w/minor details
mariaigartua Dec 8, 2024
3434da6
added Meet The Team page
mariaigartua Dec 8, 2024
2f08361
ValetBike Prototype
mariaigartua Dec 8, 2024
68be821
check bugs
mariaigartua Dec 8, 2024
088977c
Deleted old bugs
jaltamiranobello Dec 9, 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"
}
]
}
8 changes: 7 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,14 @@ 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"

gem 'geocoder'
37 changes: 36 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
base64 (0.2.0)
bcrypt (3.1.20)
bindex (0.8.1)
bootsnap (1.13.0)
msgpack (~> 1.2)
Expand All @@ -84,15 +86,25 @@ GEM
childprocess (4.1.0)
concurrent-ruby (1.1.10)
crass (1.0.6)
csv (3.3.0)
debug (1.6.2)
irb (>= 1.3.6)
reline (>= 0.3.1)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
digest (3.1.0)
dotenv (2.8.1)
dotenv-rails (2.8.1)
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.11.0)
geocoder (1.8.4)
base64 (>= 0.1.0)
csv (>= 3.0.0)
globalid (1.0.0)
activesupport (>= 5.0)
i18n (1.12.0)
Expand All @@ -115,6 +127,7 @@ GEM
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.8)
minitest (5.16.3)
msgpack (1.5.6)
mysql2 (0.5.4)
Expand All @@ -132,11 +145,17 @@ GEM
digest
net-protocol
timeout
nio4r (2.5.8)
nio4r (2.7.4)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.8-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
public_suffix (5.0.0)
puma (5.6.5)
nio4r (~> 2.0)
Expand Down Expand Up @@ -175,6 +194,9 @@ GEM
regexp_parser (2.5.0)
reline (0.3.1)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.5)
rubyzip (2.3.2)
selenium-webdriver (4.4.0)
Expand All @@ -191,9 +213,14 @@ GEM
sprockets (>= 3.0.0)
stimulus-rails (1.1.0)
railties (>= 6.0.0)
stripe (13.1.1)
strscan (3.0.4)
tailwindcss-rails (2.0.12)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.12-x86_64-linux)
railties (>= 6.0.0)
thor (1.2.1)
Expand All @@ -204,6 +231,8 @@ GEM
railties (>= 6.0.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
Expand All @@ -222,14 +251,19 @@ GEM
zeitwerk (2.6.0)

PLATFORMS
# x86_64-darwin-23
arm64-darwin-20
arm64-darwin-23
x86_64-darwin-23
x86_64-linux

DEPENDENCIES
bootsnap
capybara
debug
devise
dotenv-rails
geocoder
importmap-rails
jbuilder
mysql2 (~> 0.5)
Expand All @@ -239,6 +273,7 @@ DEPENDENCIES
selenium-webdriver
sprockets-rails
stimulus-rails
stripe
tailwindcss-rails
turbo-rails
tzinfo-data
Expand Down
2 changes: 0 additions & 2 deletions Procfile.dev

This file was deleted.

3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# ValetBike

Smith College CSC223: Software Engineering\
Group Members: Maggie, Nafisa, Fernanda, Mackenzie, Maria Jose

Starter App for ValetBike project

## Environment Configuration
Expand Down
Binary file added app/assets/images/background-girl-bike.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bikeLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bikes.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bikes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/dropdown-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/girl-bike.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icon-join.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icon-park.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icon-rent.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/icon-ride.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/login-image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/loginpage-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added app/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/placeholder-image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/registrationBike.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/team.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@
*= require_tree .
*= require_self
*/

.right-section{
float: right;
position: relative;
}

#map{
position: relative;
width: 77.5%;
height: 600px;
/* float: right; */
}
138 changes: 138 additions & 0 deletions app/assets/stylesheets/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}

body {
margin: 0;
font-family: "Poppins", Arial, sans-serif;
}

/* Main Content */
#site-container {
padding-top: 60px;
}

/* Navbar */
.topnav {
width: 100%;
position: fixed;
top: 0;
left: 0;
z-index: 1000;
background-color: #ffccd5;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 20px;
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
height: 60px;
}

.logo {
height: 50px;
width: auto;
}

.valetbike {
flex: 1;
text-align: center;
font-size: 1rem;
font-weight: bold;
font-family: "Arial Black", Gadget, sans-serif;
color: #d80555;
letter-spacing: 1px;
}

.nav-links {
display: flex;
align-items: center;
}

.nav-links a {
text-decoration: none;
color: #333;
font-size: 17px;
padding: 14px 16px;
text-align: center;
transition: background-color 0.3s, color 0.3s;
}

.nav-links a:hover,
.nav-links a.active {
background-color: #ffb6c1;
color: black;
}

.dropdown {
position: relative;
}

.dropdown .dropbtn {
background-color: transparent;
border: none;
color: #333;
font-size: 17px;
cursor: pointer;
padding: 14px 16px;
}

.dropdown:hover .dropbtn {
background-color: #ffb6c1;
color: white;
}

.dropdown-content {
display: none;
position: absolute;
background-color: white;
min-width: 160px;
box-shadow: 0px 8px 16px rgba(0, 0, 0, 0.2);
z-index: 1;
}

.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}

.dropdown-content a:hover {
background-color: #ddd;
}

.dropdown:hover .dropdown-content {
display: block;
}




/* Mobile Responsiveness */
@media screen and (max-width: 600px) {
.nav-links a,
.dropdown .dropbtn {
display: none;
}

.topnav.responsive {
flex-direction: column;
align-items: flex-start;
}

.topnav.responsive .icon {
position: absolute;
right: 20px;
top: 20px;
}

.topnav.responsive .nav-links a,
.topnav.responsive .dropdown .dropbtn {
display: block;
text-align: left;
width: 100%;
}
}

5 changes: 4 additions & 1 deletion app/assets/stylesheets/flexbox-ultralight.css
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,7 @@
-webkit-justify-content: space-around;
-ms-justify-content: space-around;
justify-content: space-around;
}
}



Loading