Fernanda

Gemfile.lock

@@ -132,7 +132,7 @@ 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-linux)
@@ -223,6 +223,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES

README.md

@@ -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

app/controllers/bike_controller.rb

@@ -0,0 +1,13 @@
+class BikeController < ApplicationController
+  def get_bike_id
+    self.bike_id
+  end
+
+  def get_station_id
+    self.station_id
+  end
+
+  def get_station_name
+    self.station
+  end
+end

app/controllers/card_controller.rb

@@ -0,0 +1,13 @@
+class CardController < ApplicationController
+  def remove_card
+  end
+
+  def update_payment
+  end
+
+  def verify_payment
+  end
+
+  def pay
+  end
+end

app/controllers/customers_controller.rb

@@ -0,0 +1,56 @@
+class CustomersController < ApplicationController
+  # the view for this action displays the form to login 
+  def new 
+  end 
+
+  # processes the parameters of the login form to set current Customer
+  def create 
+    @customer = Customer.new(customer_params)
+    if @customer.save
+      render('create')
+    else 
+      render('new')
+    end
+    # user = User.find_by(username: params(:username))
+    # if user password is correct 
+      # then set session[:user_id] = user.id
+      # send confirmation message 
+      # re route to main page 
+    # else, user password is incorrect
+      # send error message 
+  end 
+
+  # displays Customer data
+  def show 
+  end 
+
+  # the view for this action displays the form to edit Customer 
+  def edit 
+  end
+
+  # processes the parameters of the edit form 
+  def update 
+  end
+
+  # processes the deletion of account
+  def destroy
+  end 
+
+  def start_trip
+  end
+
+  def end_trip
+  end
+
+  def past_trip_calculations
+  end
+
+  private 
+  def customer_params
+    params.require(:customer).permit(
+      :firstName,
+      :lastName,
+      :email,
+      :password)
+  end
+end

app/controllers/directors_controller.rb

@@ -0,0 +1,27 @@
+class DirectorsController < ApplicationController
+
+  # the view for this action is the main page
+  def main 
+  end 
+
+  # the view for this action displays the form to register 
+  def new
+  end
+
+  # intakes the parameters from the form to create a new Customer 
+  def create 
+    user = User.create(params[:customer])
+    if user.valid?
+      session[:user_id] = user.id
+      # change to json messaging in the future 
+      puts "Successful Registration"
+      redirect_to(action: 'main') 
+    else 
+      puts "Unsuccessful Registration" 
+    end 
+  end
+
+  def login
+  end
+
+end

app/controllers/stations_controller.rb

@@ -3,5 +3,20 @@ class StationsController < ApplicationController
   def index
     @stations = Station.all.order(identifier: :asc)
   end
-
+
+  def has_bike(bike_id)
+
+  end
+
+  def checkout_bike(bike_id)
+
+  end
+
+  def return_bike(bike_id)
+
+  end
+
+  def get_list_of_bikes(station_id)
+
+  end
 end

app/controllers/users_controller.rb

@@ -0,0 +1,2 @@
+class UsersController < ApplicationController
+end

app/helpers/bike_helper.rb

@@ -0,0 +1,2 @@
+module BikeHelper
+end

app/helpers/card_helper.rb

@@ -0,0 +1,2 @@
+module CardHelper
+end

app/helpers/customers_helper.rb

@@ -0,0 +1,2 @@
+module CustomersHelper
+end

app/helpers/directors_helper.rb

@@ -0,0 +1,2 @@
+module DirectorsHelper
+end

app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

app/models/card.rb

@@ -0,0 +1,24 @@
+class Card < ApplicationRecord
+    # Example methods for the Card model
+
+    # Remove the card instance
+    def remove_card
+      destroy
+    end
+
+    # Verify the card
+    def verify
+      update(verified: true)
+    end
+
+    # Process a payment
+    def pay(amount)
+      if card_balance >= amount
+        update(card_balance: card_balance - amount)
+        true
+      else
+        false
+      end
+    end
+  end
+

app/models/customer.rb

@@ -0,0 +1,20 @@
+class Customer < ApplicationRecord
+    # email format -- not tested yet 
+    EMAIL_REGEX = /\A[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}\Z/i
+
+    # ensures that the Customer has each of these data points 
+    validates_presence_of   :identifier,
+                            :firstName,
+                            :lastName,
+                            :email,
+                            :password
+    # ensures that a customer cannot register if email already exists in database 
+    validates_uniqueness_of :identifier,
+                            :email 
+    # ensures that the email is in the correct format -- not tested yet
+    validates :email, presence: true,
+                    length: { maximum: 100 },
+										uniqueness: true,
+                    format: { with: EMAIL_REGEX },
+                    confirmation: true
+end

app/models/director.rb

@@ -0,0 +1,2 @@
+class Director < ApplicationRecord
+end

app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ApplicationRecord
+end

app/views/bike/get_battery_percentage.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Bike#get_battery_percentage</h1>
+  <p>Find me in app/views/bike/get_battery_percentage.html.erb</p>
+</div>

app/views/bike/get_bike_id.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Bike#get_bike_id</h1>
+  <p>Find me in app/views/bike/get_bike_id.html.erb</p>
+</div>

app/views/bike/get_station_id.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Bike#get_station_id</h1>
+  <p>Find me in app/views/bike/get_station_id.html.erb</p>
+</div>

app/views/bike/get_station_name.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Bike#get_station_name</h1>
+  <p>Find me in app/views/bike/get_station_name.html.erb</p>
+</div>

app/views/card/pay.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Card#pay</h1>
+  <p>Find me in app/views/card/pay.html.erb</p>
+</div>

app/views/card/remove_card.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Card#remove_card</h1>
+  <p>Find me in app/views/card/remove_card.html.erb</p>
+</div>

app/views/card/update_payment.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Card#update_payment</h1>
+  <p>Find me in app/views/card/update_payment.html.erb</p>
+</div>

app/views/card/verify_payment.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Card#verify_payment</h1>
+  <p>Find me in app/views/card/verify_payment.html.erb</p>
+</div>

app/views/customers/create.html.erb

@@ -0,0 +1,4 @@
+</div class = "access create">
+<h1> You are now registered!</h1>
+<%= puts @customer.firstName%>
+</div>

app/views/customers/end_trip.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Customers#end_trip</h1>
+  <p>Find me in app/views/customers/end_trip.html.erb</p>
+</div>

app/views/customers/new.html.erb

@@ -0,0 +1,30 @@
+</div class = "access new">
+<h1> Welcome to ValetBike</h1>
+
+<p> Testing Registration in Customer Class</p>
+<%= form_tag(register_path) do %>
+    <table summary = "registration">
+    <tr>
+        <th><%= label_tag(:firstName) %></th>
+        <td><%= text_field_tag(:firstName, params[:firstName]) %></td>
+    </tr>
+    <tr>
+        <th><%= label_tag(:lastName) %></th>
+        <td><%= text_field_tag(:lastName, params[:lastName]) %></td>
+    <tr>
+        <th><%= label_tag(:email) %></th>
+        <td><%= text_field_tag(:email, params[:email]) %></td>
+    </tr>
+    </tr>
+    <tr>
+        <th><%= label_tag(:password) %></th>
+        <td><%= password_field_tag(:password, params[:password]) %></td>
+    </tr>
+    </table>
+
+    <div class="form-buttons">
+      <%= submit_tag("Register") %>
+    </div>
+    <%end%>
+</div>
+

app/views/customers/past_trip_calculations.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Customers#past_trip_calculations</h1>
+  <p>Find me in app/views/customers/past_trip_calculations.html.erb</p>
+</div>

app/views/customers/start_trip.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <h1 class="font-bold text-4xl">Customers#start_trip</h1>
+  <p>Find me in app/views/customers/start_trip.html.erb</p>
+</div>

app/views/directors/login.html.erb

@@ -0,0 +1,21 @@
+</div class = "access login">
+<h1> Welcome to ValetBike</h1>
+
+<p> Testing Login</p>
+<%= form_tag(login_path) do %>
+    <table summary = "login">
+    <tr>
+        <th><%= label_tag(:email) %></th>
+        <td><%= text_field_tag(:email, params[:email]) %></td>
+    </tr>
+    <tr>
+        <th><%= label_tag(:password) %></th>
+        <td><%= password_field_tag(:password, params[:password]) %></td>
+    </tr>
+    </table>
+
+    <div class="form-buttons">
+      <%= submit_tag("Log In") %>
+    </div>
+    <%end%>
+</div>

app/views/directors/main.html.erb

@@ -0,0 +1,9 @@
+<div class="page-section flexbox vertical stretch">
+  <div class="section-inner flexbox vertical stretch">
+    <div class="section-title">
+      Welcome to ValetBike, we are happy to help!
+    </div>  
+   </div>
+   <li><%= link_to("Register", "/register") %></li>
+   <li><%= link_to("Login", "/login") %></li>
+</div>

app/views/directors/new.html.erb

@@ -0,0 +1,30 @@
+</div class = "access new">
+<h1> Welcome to ValetBike</h1>
+
+<p> Testing Registration</p>
+<%= form_tag(register_path) do %>
+    <table summary = "registration">
+    <tr>
+        <th><%= label_tag(:firstName) %></th>
+        <td><%= text_field_tag(:firstName, params[:firstName]) %></td>
+    </tr>
+    <tr>
+        <th><%= label_tag(:lastName) %></th>
+        <td><%= text_field_tag(:lastName, params[:lastName]) %></td>
+    <tr>
+        <th><%= label_tag(:email) %></th>
+        <td><%= text_field_tag(:email, params[:email]) %></td>
+    </tr>
+    </tr>
+    <tr>
+        <th><%= label_tag(:password) %></th>
+        <td><%= password_field_tag(:password, params[:password]) %></td>
+    </tr>
+    </table>
+
+    <div class="form-buttons">
+      <%= submit_tag("Register") %>
+    </div>
+    <%end%>
+</div>
+

app/views/stations/index.html.erb

@@ -1,7 +1,7 @@
 <div class="page-section flexbox vertical stretch">
   <div class="section-inner flexbox vertical stretch">
     <div class="section-title">
-      Welcome to ValetBike!
+      Welcome to ValetBike, we are happy to help!
     </div>  
     <div class="flexbox vertical stretch">
       <% if @stations.present? %>