Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
0d7391d
Created rake task to import station & bike data from csv files
paolacalle Sep 14, 2023
bcee2cb
Added navbar/links, displayed bike/station lists, add more pages
paolacalle Sep 17, 2023
307fb27
extracted stations data, added img to home, got docked bikes to work …
paolacalle Sep 18, 2023
a97704c
removed unwanted file
paolacalle Nov 2, 2023
42918f5
My name
paolacalle Nov 2, 2023
01ec38c
edits to readme
chel48 Nov 2, 2023
9075d76
Created memebership and user basics
paolacalle Nov 5, 2023
1252fa6
payment and rental forms and mvc
chel48 Nov 5, 2023
2f34480
changed
paolacalle Nov 5, 2023
837ef0f
Merge pull request #1 from paolacalle/chelseafowler
paolacalle Nov 5, 2023
f0dd917
payment amount forgotten column
chel48 Nov 5, 2023
40a7ed6
Merge branch 'master' into paolacalle
paolacalle Nov 5, 2023
f4a3ad7
Merge pull request #2 from paolacalle/paolacalle
paolacalle Nov 5, 2023
724f86a
Added bolderplate for login
paolacalle Nov 6, 2023
c267c13
Merge pull request #3 from paolacalle/paolacalle
paolacalle Nov 6, 2023
ef39e71
added some ux changes to user, membership + navbar
okveery Nov 7, 2023
9ec3451
Merge pull request #4 from paolacalle/chelseafowler
paolacalle Nov 7, 2023
22fec45
Login routes
paolacalle Nov 7, 2023
e123d22
Merge pull request #5 from paolacalle/master
paolacalle Nov 7, 2023
b338e7e
Merge branch 'login-redirect' into login
paolacalle Nov 7, 2023
49dc453
Merge pull request #6 from paolacalle/login
paolacalle Nov 7, 2023
574e5ee
Fixed error with missing amount
paolacalle Nov 7, 2023
ce081cf
fixed route to membership
paolacalle Nov 7, 2023
1c46975
added bcyrpt for password encrpytion
paolacalle Nov 7, 2023
5593b77
Allow users to either login or signup
paolacalle Nov 7, 2023
920e1a3
removed dijest attr and got the sign in to work with db
paolacalle Nov 7, 2023
6829104
added required create user
paolacalle Nov 7, 2023
86c6f58
Merge branch 'master' into login-redirect
paolacalle Nov 9, 2023
2c2c636
Merge pull request #7 from paolacalle/login-redirect
paolacalle Nov 9, 2023
4c8dd0a
changed the rake files for stations and bikes to create the associati…
paolacalle Nov 10, 2023
b00d885
validate rental fields, error flash not working
kemerson-ryan Nov 10, 2023
0d0daad
added changes to stations and bikes
paolacalle Nov 11, 2023
6ae4c28
removed uneeded station columns
paolacalle Nov 11, 2023
7083587
Merge pull request #8 from paolacalle/rake-bikes-stations
paolacalle Nov 11, 2023
0f4367a
User can now log in
paolacalle Nov 11, 2023
bb79c70
Merge pull request #9 from paolacalle/rake-bikes-stations
paolacalle Nov 11, 2023
67f82b0
Merge pull request #10 from paolacalle/login
paolacalle Nov 11, 2023
181d5e8
flashesworking entrytypesvalidated formatallflash
kemerson-ryan Nov 12, 2023
058f6cc
Merge branch 'master' into rentalpaymententrytypevalidation
paolacalle Nov 12, 2023
4668230
Merge pull request #11 from paolacalle/rentalpaymententrytypevalidation
paolacalle Nov 12, 2023
8005367
Fixed double route error
paolacalle Nov 12, 2023
6edb2ef
format of all lists the same, navbar logo + color
kemerson-ryan Nov 13, 2023
069e696
navbarlogo formatpaymentpage titletodo svgsizetodo
kemerson-ryan Nov 14, 2023
6024659
Merge pull request #13 from paolacalle/somestyle
kemerson-ryan Nov 14, 2023
1794057
logout works
paolacalle Nov 14, 2023
6bfeefb
changes to user controller
paolacalle Nov 14, 2023
806c71c
Fixed flash display and add simple css
paolacalle Nov 15, 2023
fdcfa22
sort for all views
kemerson-ryan Nov 15, 2023
657c591
added search button and added some css
paolacalle Nov 15, 2023
0c2a6d3
rental has user, columns added for that
kemerson-ryan Nov 15, 2023
ede0da9
trying to update association between rental/user
kemerson-ryan Nov 16, 2023
6ddda7d
has_bikeCantRentMultipleBikes at once. noreturnyet
kemerson-ryan Nov 16, 2023
009bff4
Merge pull request #14 from paolacalle/morestyle
kemerson-ryan Nov 16, 2023
4d02f79
geolocation done working on calculating distance
paolacalle Nov 18, 2023
806e759
Flashes will now display errors and successes
kemerson-ryan Nov 19, 2023
713d64c
Merge pull request #15 from paolacalle/rentalflashesdisplay
kemerson-ryan Nov 19, 2023
a9ecffa
Revert "Rentalflashesdisplay"
kemerson-ryan Nov 19, 2023
69f6fac
Merge pull request #16 from paolacalle/revert-15-rentalflashesdisplay
kemerson-ryan Nov 19, 2023
e2e120c
rental flashes worknow success and error displayed
kemerson-ryan Nov 19, 2023
91b6878
Merge pull request #17 from paolacalle:rentalflashesredo
kemerson-ryan Nov 19, 2023
e6cf527
button class to style all of the buttons, placeholder in payments, va…
chel48 Nov 19, 2023
8bbf4ad
to actually display the errors and successes
kemerson-ryan Nov 19, 2023
46dd2ef
Merge pull request #19 from paolacalle/layouthelpererrorsuccess
kemerson-ryan Nov 19, 2023
172bb81
Merge branch 'master' into dropdowns_and_associations
kemerson-ryan Nov 19, 2023
1df4064
Merge pull request #18 from paolacalle/dropdowns_and_associations
kemerson-ryan Nov 19, 2023
ca3e199
map basic
paolacalle Nov 20, 2023
35bde84
nav
paolacalle Nov 20, 2023
f61e04d
added locations
paolacalle Nov 20, 2023
87e2390
Merge branch 'master' into gelocation
paolacalle Nov 20, 2023
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
Empty file added .vs/slnx.sqlite
Empty file.
7 changes: 6 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ gem "redis", "~> 4.0"
# gem "kredis"

# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
# gem "bcrypt", "~> 3.1.7"
gem "bcrypt", "~> 3.1.7"

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
Expand Down Expand Up @@ -83,3 +83,8 @@ gem 'dotenv-rails'
# gem 'paperclip
# gem 'uniquify'
# gem 'will_paginate'

gem "geocoder", "~> 1.8"

# dynamic map
gem "mapkick-rb"
8 changes: 8 additions & 0 deletions 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.19)
bindex (0.8.1)
bootsnap (1.13.0)
msgpack (~> 1.2)
Expand All @@ -93,6 +94,7 @@ GEM
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.11.0)
geocoder (1.8.2)
globalid (1.0.0)
activesupport (>= 5.0)
i18n (1.12.0)
Expand All @@ -111,6 +113,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
mapkick-rb (0.1.5)
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
Expand Down Expand Up @@ -223,15 +226,20 @@ GEM

PLATFORMS
arm64-darwin-20
arm64-darwin-21
arm64-darwin-22
x86_64-linux

DEPENDENCIES
bcrypt (~> 3.1.7)
bootsnap
capybara
debug
dotenv-rails
geocoder (~> 1.8)
importmap-rails
jbuilder
mapkick-rb
mysql2 (~> 0.5)
puma (~> 5.0)
rails (~> 7.0.3, >= 7.0.3.1)
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# ValetBike

Paola
Smith College CSC223: Software Engineering\
Starter App for ValetBike project
This is a change that I am making to valetbike!

## Environment Configuration

Expand Down
14 changes: 14 additions & 0 deletions app/assets/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/stylesheets/button.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@


.button{
background-color: rgb(132 204 22);
}
20 changes: 20 additions & 0 deletions app/assets/stylesheets/error-messages.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/* Error Messages CSS */
.error-explanation {
background-color: #fed7d7;
border: 1px solid #f98080;
color: #c53030;
padding: 1rem;
border-radius: 0.375rem;
margin-top: 1rem;
}

.error-list {
list-style-type: disc;
padding-left: 1.25rem;
margin-top: 0.5rem;
}

.error-message {
font-weight: bold;
}

19 changes: 19 additions & 0 deletions app/assets/stylesheets/flash.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.flash{
padding: 20px;
color: white;
width: 90%; /* Set width to 100% of the parent element */
opacity: 90%;
margin-left: auto;
margin-right: auto;

}

#notice {
background-color: var(--green-color); /* Override color for notice */
border-color: 3px, solid, var(--dark-green-color);
}

#alert {
background-color: var(--red-color); /* Red for alert, green for notice */
border-color: 3px, solid, var(--dark-green-color);
}
34 changes: 34 additions & 0 deletions app/assets/stylesheets/form.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
.form-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 20px;
}

.form-group {
margin-bottom: 15px;
}

label {
display: block;
margin-bottom: 5px;
color: var(--light-black-color);
font-weight: bold;
}

input[type="text"], input[type="password"] {
/* Inherits styles from previous CSS */
width: 100%; /* Adjust as necessary */
color: black;
}

.form-buttons {
display: flex;
justify-content: center;
margin-top: 20px;
}

input#search_by_address {
color: black;
}
42 changes: 42 additions & 0 deletions app/assets/stylesheets/navbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/* currently does not work...not invoked or something - ryan */
/* change navbar background color to custom */
#navbar {
padding-top: 2%;
padding-bottom: 4%;
z-index: 100;
background-color: var(--blue-color);
height: 5em;
}

#navbar-content {
height: 3em;
width: 100%;
}

@media (min-width: 80em){
#navbar-content {
width: 70em;
}

.logo {

}
}


.white-fill {
fill: var(--medium-white-color);

}

.logo {
margin-left: 1em;
}

.dropdown-menu {
z-index: 1000; /* Adjust the value as needed */
position: relative;
}

}

24 changes: 24 additions & 0 deletions app/assets/stylesheets/pages.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,38 @@
line-height: 1.75em;
}

.record-row.header {
background: var(--black-color);
color:aliceblue;
}


.record-row.even {
background: var(--medium-white-color);
}

.record-row.even.flexbox:hover{
background: var(--light-black-color);
color:aliceblue;
}

.record-row.odd {
background: var(--dark-white-color);
}

.record-row.odd.flexbox:hover{
background: var(--light-black-color);
color:aliceblue;
}

.fill-block {
display: block;
height: 100%;
width: 100%;
text-decoration: none;
}



/***********************************/
/* Responsiveness */
Expand Down
32 changes: 32 additions & 0 deletions app/assets/stylesheets/popup.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.modal {
position: fixed;
z-index: 1000;
padding: 2em;

/* Centering */
left: 50%;
top: 50%;
transform: translate(-50%, -50%);

overflow: auto;
background-color: rgb(0,0,0);
background-color: rgba(255, 255, 255, 0.1);
border-radius: 5px;
/* Add the drop shadow */
box-shadow: 0 0 10px 0 rgba(0,0,0,0.2), 0 5px 10px 0 rgba(0,0,0,0.19);
}

.cancel-button {
background-color: #1530ff;
font-size: 12px;
color: white;
padding: 4px 8px;
border: none;
border-radius: 4px;
cursor: pointer;
float: right;
text-decoration: none;
}
.cancel-button:hover {
background-color: #2640fe;
}
6 changes: 6 additions & 0 deletions app/assets/stylesheets/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@
--medium-white-color: #FDFCFD;
--white-color: #FFFFFF;

--green-color: #3BD6AF;
--dark-green-color: rgb(23, 84, 4);
--orange-color: #F89356;
--blue-color: #4B719D;
--red-color: #db6363;
--dark-red-color: #7e0303;
}
11 changes: 11 additions & 0 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
class ApplicationController < ActionController::Base
#declare as helper so accessable to all views
before_action :require_login

def require_login
redirect_to new_session_path unless session.include? :user_id
end

private
def current_user
@current_user ||= User.find(session[:user_id]) if session[:user_id]
end
end
10 changes: 10 additions & 0 deletions app/controllers/bikes_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class BikesController < ApplicationController
def index
if params[:reverse].blank? || params[:reverse] == "0"
@bikes = Bike.all.order(identifier: :asc)
else
@bikes = Bike.all.order(identifier: :desc)
end
end

end
23 changes: 23 additions & 0 deletions app/controllers/categories_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
class CategoriesController < ApplicationController
def index
end

def show
end

def edit
end

def create
end

def delete
end

def destroy
end

def new
end

end
4 changes: 4 additions & 0 deletions app/controllers/home_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class HomeController < ApplicationController
def index
end
end
Loading