Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
9c06b60
Updated Welcome Message
jaltamiranobello Sep 8, 2024
d6a73a0
Added name to README.md file
mneedham01 Oct 29, 2024
a9943e0
Fernanda Testing
jaltamiranobello Oct 29, 2024
2f070cd
name added to read me
nmohamed54321 Oct 29, 2024
ff34f97
Merge pull request #3 from jaltamiranobello/nmohamed
jaltamiranobello Oct 29, 2024
9c5f831
Merge branch 'master' into maggie
jaltamiranobello Oct 29, 2024
31931ba
Merge pull request #2 from jaltamiranobello/maggie
jaltamiranobello Oct 29, 2024
79af37c
Merge branch 'master' into fernanda
jaltamiranobello Oct 29, 2024
5dbf6dd
Merge pull request #1 from jaltamiranobello/fernanda
jaltamiranobello Oct 29, 2024
87b5dab
Added new line
jaltamiranobello Oct 29, 2024
05fedee
Merge pull request #4 from jaltamiranobello/fernanda
jaltamiranobello Oct 29, 2024
c94c576
Testing branch
jaltamiranobello Oct 29, 2024
9c683a1
added name to readme
mmartin-smith Oct 29, 2024
72d8dee
Merge pull request #5 from jaltamiranobello/fernanda
jaltamiranobello Oct 29, 2024
ee9536f
Showing Nafisa
jaltamiranobello Oct 29, 2024
753252f
Merge pull request #6 from jaltamiranobello/fernanda
jaltamiranobello Oct 29, 2024
9d5f301
Merge pull request #7 from jaltamiranobello/Mackenzie
jaltamiranobello Oct 30, 2024
e2a965d
Creating a stub for the station class.
mmartin-smith Oct 30, 2024
65e73f3
Generated controller and views for Users class
mneedham01 Oct 30, 2024
7ce4c6b
Merge pull request #8 from jaltamiranobello/station_basics
jaltamiranobello Oct 31, 2024
12eb229
Merge pull request #9 from jaltamiranobello/maggie
jaltamiranobello Oct 31, 2024
e756e40
Created User Model and User Migration
jaltamiranobello Oct 31, 2024
1db2320
Merge pull request #10 from jaltamiranobello/fernanda
jaltamiranobello Oct 31, 2024
555c193
Added my name to README
mariaigartua Nov 1, 2024
4ddfb6d
Added my name to README
mariaigartua Nov 2, 2024
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
68df098
info about bike/station class
nmohamed54321 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
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
2255407
First commit in stations branch
jaltamiranobello Nov 21, 2024
b5d7c39
created a rake file to read the bikes
nmohamed54321 Nov 21, 2024
5ac04ed
started the rake file for stations
nmohamed54321 Nov 21, 2024
3bb048f
read in the csv for station to create rake database
nmohamed54321 Nov 21, 2024
1f4e2b2
Completed the rake task to read in the database also updated the data…
nmohamed54321 Nov 21, 2024
fe8c038
Created station file to make rake
jaltamiranobello Nov 21, 2024
06d1aff
Added more css to manipulate the view for the stations and bikes
nmohamed54321 Nov 22, 2024
7688a55
Previous on Added more css to manipulate the view for the stations an…
nmohamed54321 Nov 22, 2024
627f742
Added the bike methods in the controller class
nmohamed54321 Nov 22, 2024
ae88165
Added the station methods in the controller class
nmohamed54321 Nov 22, 2024
e1c0c30
Created a partial for the bike
nmohamed54321 Nov 22, 2024
f75fcb1
deleted the view pages called delete and new
nmohamed54321 Nov 22, 2024
501bb39
Added the needed code in the index file to call the partial and displ…
nmohamed54321 Nov 22, 2024
09dd013
Added the needed code for the show page of the stations so that it di…
nmohamed54321 Nov 22, 2024
27f0730
Just deleted something I added for testing hhhh
nmohamed54321 Nov 22, 2024
0daea77
added css and stwiched the locations of some
nmohamed54321 Nov 22, 2024
375a637
Fixed the writing in how it appeared on the view
nmohamed54321 Nov 22, 2024
29b6e66
Testing purposes for now. but i think i might delete this page later
nmohamed54321 Nov 22, 2024
e8a46c0
I have to fix something in this page later today. you can pull it if …
nmohamed54321 Nov 22, 2024
17e4501
added br tag and got rid of some unnessecary stuff
nmohamed54321 Nov 22, 2024
47d1168
Changed the name at the end
nmohamed54321 Nov 22, 2024
afe8fba
There is no bug, but will modify this so that it displays all the bik…
nmohamed54321 Nov 22, 2024
2a123c6
Created header for the station index page
nmohamed54321 Nov 22, 2024
5f5cef9
updated to show the station by the identifier
nmohamed54321 Nov 22, 2024
03703a8
Made CSS classes for to create the header for the stations index page
nmohamed54321 Nov 22, 2024
5b8fa67
Created rake task to read in the station csv file into the database
jaltamiranobello Nov 23, 2024
546cccb
Updated nio4r package
jaltamiranobello Nov 23, 2024
6792d49
Added the css for the buttons, but they are responsive to on click wi…
nmohamed54321 Nov 23, 2024
73330c5
Added a p tag
nmohamed54321 Nov 23, 2024
e2ef5fe
fixes the text on the view
nmohamed54321 Nov 23, 2024
ee0cb02
Merge branch 'nmohamed' of https://github.com/jaltamiranobello/valetb…
nmohamed54321 Nov 23, 2024
df17d3a
Updated the bikes to correctly match the stations based on the identi…
nmohamed54321 Nov 23, 2024
ea1e793
Updated the has_many/belongs_to relationship between the bikes and st…
jaltamiranobello Nov 25, 2024
d2d7feb
Added formatted header for the view bike inventory page
jaltamiranobello Nov 25, 2024
839943e
added more css for button reactions
nmohamed54321 Nov 25, 2024
a4798d2
added a button show
nmohamed54321 Nov 25, 2024
d48ca0c
added a link back to the stations
nmohamed54321 Nov 25, 2024
a23503f
Created button/updated format in the view bike inventory to return to…
jaltamiranobello Nov 26, 2024
eaf2578
Added a button that will later connect to the start trip path
jaltamiranobello Nov 26, 2024
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
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"
}
]
}
3 changes: 3 additions & 0 deletions 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
22 changes: 21 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ GEM
tzinfo (~> 2.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
bcrypt (3.1.20)
bindex (0.8.1)
bootsnap (1.13.0)
msgpack (~> 1.2)
Expand All @@ -87,6 +88,12 @@ GEM
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)
Expand Down Expand Up @@ -132,11 +139,14 @@ GEM
digest
net-protocol
timeout
nio4r (2.5.8)
nio4r (2.7.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 +185,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 @@ -194,6 +207,8 @@ GEM
strscan (3.0.4)
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 +219,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 @@ -223,12 +240,15 @@ GEM

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

DEPENDENCIES
bootsnap
capybara
debug
devise
dotenv-rails
importmap-rails
jbuilder
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

Smith College CSC223: Software Engineering\
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/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.
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.
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