Revert 20 mei

Gemfile.lock

@@ -223,6 +223,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-22
   x86_64-linux
 
 DEPENDENCIES

README.md

@@ -1,4 +1,6 @@
 # ValetBike
+Calicoders
+local version testing
 
 Smith College CSC223: Software Engineering\
 Starter App for ValetBike project
@@ -155,3 +157,5 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 
 You should have received a copy of the GNU Affero General Public License along with this program. If not, see https://www.gnu.org/licenses.
 
+
+Sami Aiyathurai

app/assets/stylesheets/application.css

@@ -13,3 +13,4 @@
  *= require_tree .
  *= require_self
  */
+

app/assets/stylesheets/global.css

@@ -33,3 +33,74 @@ body {
   color: var(--black-color);
   background: var(--white-color);
 }
+
+/* Apply styles to the header element */
+header {
+  background-color: #9698fc; /* Background color for the header */
+  color: #fff; /* Text color for the header */
+  padding: 10px; /* Padding around the header content */
+  width: 100%; /* Make the header take up the whole width */
+  margin: 0; /* Remove default margin */
+}
+
+/* Style the navigation links */
+header nav ul {
+  list-style: none;
+  padding: 20px 0;
+  margin: 0;
+  text-align: right; /* Align the links to the right */
+}
+
+header nav ul li {
+  display: inline;
+  margin-right: 20px;
+}
+
+header nav ul li a {
+  text-decoration: none;
+  color: #fff;
+}
+
+/* Style for the header links on hover */
+header nav ul li a:hover {
+  text-decoration: underline;
+}
+
+/* Apply styles to the footer element */
+footer {
+  background-color: #9698fc; /* Background color for the footer */
+  color: #fff; /* Text color for the footer */
+  padding: 10px; /* Padding around the footer content */
+  width: 100%; /* Make the footer take up the whole width */
+  margin: 0; /* Remove default margin */
+  position: fixed; /* Position the footer as fixed */
+  bottom: 0; /* Stick it to the bottom of the viewport */
+  left: 0; /* Align to the left of the viewport */
+  right: 0; /* Align to the right of the viewport */
+}
+
+/* Style the footer links */
+footer ul {
+  list-style: none; /* Remove bullet points from the list */
+  padding: 20px 0;
+  margin: 0;
+  text-align: right; /* Align the links to the right */
+}
+
+footer li {
+  display: inline; /* Display the list items horizontally */
+  margin-right: 20px; /* Add space between list items */
+}
+
+footer a {
+  text-decoration: none; /* Remove underlines from the links */
+  color: #fff; /* Text color for the links */
+}
+
+/* Style for the footer links on hover */
+footer a:hover {
+  text-decoration: underline; /* Underline the links on hover */
+}
+
+
+

app/controllers/about_controller.rb

@@ -0,0 +1,4 @@
+class AboutController < ApplicationController
+  def index
+  end
+end

app/controllers/account_controller.rb

@@ -0,0 +1,4 @@
+class AccountController < ApplicationController
+  def index
+  end
+end

app/controllers/active_trip_controller.rb

@@ -0,0 +1,4 @@
+class ActiveTripController < ApplicationController
+  def index
+  end
+end

app/controllers/add_more_time_controller.rb

@@ -0,0 +1,4 @@
+class AddMoreTimeController < ApplicationController
+  def index
+  end
+end

app/controllers/bikes_controller.rb

@@ -0,0 +1,11 @@
+class BikesController < ApplicationController
+    def index
+        @bikes = Bike.all.order(identifier: :asc)
+    end
+
+    def show
+        @bike = Bike.find(params[:id])
+    rescue ActiveRecord::RecordNotfound
+      redirect_to root_path
+    end
+end

app/controllers/edit_current_trip_controller.rb

@@ -0,0 +1,4 @@
+class EditCurrentTripController < ApplicationController
+  def index
+  end
+end

app/controllers/help_controller.rb

@@ -0,0 +1,4 @@
+class HelpController < ApplicationController
+  def index
+  end
+end

app/controllers/home_page_controller.rb

@@ -0,0 +1,4 @@
+class HomePageController < ApplicationController
+  def index
+  end
+end

app/controllers/how_it_works_controller.rb

@@ -0,0 +1,4 @@
+class HowItWorksController < ApplicationController
+  def index
+  end
+end

app/controllers/login_sign_up_controller.rb

@@ -0,0 +1,4 @@
+class LoginSignUpController < ApplicationController
+  def index
+  end
+end

app/controllers/membership_plans_controller.rb

@@ -0,0 +1,4 @@
+class MembershipPlansController < ApplicationController
+  def index
+  end
+end

app/controllers/past_trips_controller.rb

@@ -0,0 +1,4 @@
+class PastTripsController < ApplicationController
+  def index
+  end
+end

app/controllers/payment_information_controller.rb

@@ -0,0 +1,4 @@
+class PaymentInformationController < ApplicationController
+  def index
+  end
+end

app/controllers/report_a_problem_controller.rb

@@ -0,0 +1,4 @@
+class ReportAProblemController < ApplicationController
+  def index
+  end
+end

app/controllers/settings_controller.rb

@@ -0,0 +1,4 @@
+class SettingsController < ApplicationController
+  def index
+  end
+end

app/controllers/stations_controller.rb

@@ -3,5 +3,11 @@ class StationsController < ApplicationController
   def index
     @stations = Station.all.order(identifier: :asc)
   end
+
+  def show
+    @station = Station.find(params[:id])
+  rescue ActiveRecord::RecordNotfound
+    redirect_to root_path
+  end
 
 end

app/controllers/trip_planning_controller.rb

@@ -0,0 +1,4 @@
+class TripPlanningController < ApplicationController
+  def index
+  end
+end

app/helpers/about_helper.rb

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

app/helpers/accoutn_helper.rb

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

app/helpers/active_trip_helper.rb

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

app/helpers/add_more_time_helper.rb

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

app/helpers/edit_current_trip_helper.rb

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

app/helpers/help_helper.rb

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

app/helpers/home_page_helper.rb

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

app/helpers/how_it_works_helper.rb

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

app/helpers/login_sign_up_helper.rb

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

app/helpers/membership_plans_helper.rb

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

app/helpers/past_trips_helper.rb

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

app/helpers/payment_information_helper.rb

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

app/helpers/report_a_problem_helper.rb

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

app/helpers/settings_helper.rb

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

app/helpers/trip_planning_helper.rb

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

app/models/favorite.rb

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

app/models/membership.rb

@@ -0,0 +1,3 @@
+class Membership < ApplicationRecord
+    has_many :users, class_name: :User, foreign_key: :membership_id
+end

app/models/report.rb

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

app/models/station.rb

@@ -5,5 +5,7 @@ class Station < ApplicationRecord
   validates_uniqueness_of  :identifier
 
   has_many :docked_bikes, class_name: :Bike, foreign_key: :current_station_id
-
+  has_many :started_trips, class_name: :Trip, foreign_key: :start_station_id
+  has_many :ended_trips, class_name: :Trip, foreign_key: :end_station_id
+
 end

app/models/transaction.rb

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

app/models/trip.rb

@@ -0,0 +1,6 @@
+class Trip < ApplicationRecord
+   # belongs_to :bike, class_name: :Bike, foreign_key: :trip_id
+    belongs_to :starting_station, class_name: :Station, foreign_key: :start_station_id
+    belongs_to :ending_station, class_name: :Station, foreign_key: :end_station_id
+    belongs_to :user, class_name: :User, foreign_key: :user_id
+end

app/models/user.rb

@@ -0,0 +1,5 @@
+class User < ApplicationRecord
+    belongs_to :membership, class_name: :Membership, foreign_key: :membership_id, optional: true
+
+    has_many :trips, class_name: :Trip, foreign_key: :user_id
+end

app/views/about/index.html.erb

@@ -0,0 +1,42 @@
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="application.css">
+</head>
+<body>
+    <header>
+        <nav>
+            <ul>
+                <li><a href="home_page.html">Home</a></li>
+				        <li><a href="about.html">About</a></li>
+                <li><a href="how_it_works.html">How It Works</a></li>
+				        <li><a href="trip_planning.html">Plan a Trip</a></li>
+                <li><a href="membership_plans.html">Membership Plans</a></li>
+                <li><a href="login_sign_up.html">Login</a></li>
+
+            </ul>
+        </nav>
+    </header>
+</body>
+</html>
+
+
+<div>
+  <h1 class="font-bold text-4xl">About#index</h1>
+  <p>Find me in app/views/about/index.html.erb</p>
+</div>
+
+
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="application.css">
+</head>
+<body>
+    <footer>
+        <ul>
+            <li><a href="help.html">Help</a></li>
+            <li><a href="contact_us.html">Contact Us</a></li>
+            <li><a href="report_a_problem.html">Report an Issue</a></li>
+        </ul>
+    </footer>
+</body>
+</html>

app/views/active_trip/index.html.erb

@@ -0,0 +1,42 @@
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="application.css">
+</head>
+<body>
+    <header>
+        <nav>
+            <ul>
+                <li><a href="home_page.html">Home</a></li>
+				        <li><a href="about.html">About</a></li>
+                <li><a href="how_it_works.html">How It Works</a></li>
+				        <li><a href="trip_planning.html">Plan a Trip</a></li>
+                <li><a href="membership_plans.html">Membership Plans</a></li>
+                <li><a href="login_sign_up.html">Login</a></li>
+
+            </ul>
+        </nav>
+    </header>
+</body>
+</html>
+
+
+<div>
+  <h1 class="font-bold text-4xl">ActiveTrip#index</h1>
+  <p>Find me in app/views/active_trip/index.html.erb</p>
+</div>
+
+
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="application.css">
+</head>
+<body>
+    <footer>
+        <ul>
+            <li><a href="help.html">Help</a></li>
+            <li><a href="contact_us.html">Contact Us</a></li>
+            <li><a href="report_a_problem.html">Report an Issue</a></li>
+        </ul>
+    </footer>
+</body>
+</html>