Skip to content

Commit

Permalink
Merge pull request #13 from JoshuaOndieki/develop
Browse files Browse the repository at this point in the history
Completed UI (challenge 1)
  • Loading branch information
JoshuaOndieki authored Jun 24, 2018
2 parents cec0b40 + 7c3d23a commit 85f91ce
Show file tree
Hide file tree
Showing 27 changed files with 1,267 additions and 1 deletion.
48 changes: 47 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,48 @@
# ride-my-way
[![Build Status](https://travis-ci.org/JoshuaOndieki/ride-my-way.svg?branch=master)](https://travis-ci.org/JoshuaOndieki/ride-my-way) [![Coverage Status](https://coveralls.io/repos/github/JoshuaOndieki/ride-my-way/badge.svg?branch=master)](https://coveralls.io/github/JoshuaOndieki/ride-my-way?branch=master) [![Maintainability](https://api.codeclimate.com/v1/badges/2c1deb66dc12dbd54068/maintainability)](https://codeclimate.com/github/JoshuaOndieki/ride-my-way/maintainability) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9baccc745e904bf8bca4f42b4dfbe939)](https://www.codacy.com/app/JoshuaOndieki/ride-my-way?utm_source=github.com&utm_medium=referral&utm_content=JoshuaOndieki/ride-my-way&utm_campaign=Badge_Grade)

# Ride My Way
Ride-my App is a carpooling application that provides drivers with the ability to create ride offers and passengers to join available ride offers.

## Getting Started

These instructions will get you a copy of the project up and running on your local machine for development and testing purposes.

### Prerequisites

A few requirements to install, run and test this project.


**Git** : Use git to git clone this project locally. [git](https://git-scm.com/)


### Installing
Type `git clone https://github.com/JoshuaOndieki/ride-my-way.git` in your terminal.

## Testing
Manually open the index.html file in your preferred browser.
Navigate through the pages with the links provided.

## Built With

- HTML
- CSS

## Versioning

This project uses tags for release and versioning.
For the versions available, see the [tags on this repository](https://github.com/JoshuaOndieki/ride-my-way/tags).

## Authors

* **Joshua Ondieki** - *Initial work* - [Joshua Ondieki](https://github.com/JoshuaOndieki)


## License

This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details

## Acknowledgments

* Andela for this wonderful learning opportunity
* Inspiration
* Andela21 Teammates, bootcampers and facilitators for their support.
41 changes: 41 additions & 0 deletions UI/addrideoffer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ride My Way | Add Offer</title>
<link rel="stylesheet" href="static/css/driver.css">
<link rel="stylesheet" href="static/css/main.css">
<link rel="stylesheet" href="static/css/addrideoffer.css">
</head>
<body>
<header>
<a href="landingpage.html" class="logo">
RideMyWay
</a>
</header>
<a href="userprofile.html" class="profilebutton">
OJ
</a>
<a href="landingpage.html" class="loginbutton">
Sign Out
</a>
<br>
<h2 class="welcome">Add your offer!</h2>
<form class="offerform" action="driverhome.html">
<div class="fieldset">
<input type="text" name="origin" placeholder="Origin" required>
<input type="text" name="destination" placeholder="destination" required>
<input type="date" name="departure" placeholder="date of departure" required>
<input type="time" name="departure" placeholder="time of departure" required>
<input type="number" name="capacity" placeholder="Vehicle Capacity" required>
<input type="number" name="contribution" placeholder="cost Ksh. 0.00 per passenger" required>
<input type="text" name="vehicletype" placeholder="Vehicle Type" required>
<input type="text" name="vehiclenumberplate" placeholder="Vehicle No. Plate" required>
</div>
<textarea name="drivernotes" rows="10" cols="50" placeholder="Driver notes.."></textarea>
<button type="submit" class="add">OFFER RIDE</button>
</form>
<footer>Made with love by OJ &copy; 2018</footer>
</body>
</html>
85 changes: 85 additions & 0 deletions UI/driverhome.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ride My Way</title>
<link rel="stylesheet" href="static/css/driver.css">
<link rel="stylesheet" href="static/css/main.css">
</head>
<body>
<header>
<a href="landingpage.html" class="logo">
RideMyWay
</a>
</header>
<a href="userprofile.html" class="profilebutton">
OJ
</a>
<a href="landingpage.html" class="loginbutton">
Sign Out
</a>
<br>
<h2 class="welcome">Welcome OJ!</h2>
<div class="ridesoffered">
<p class="ridesinfo">You have 3 active offers</p>
<a href="addrideoffer.html" class="offerride">Offer Ride</a>
<hr/>
<div class="ridesheader">
<table>
<tr>
<th>Offered On</th>
<th>Origin</th>
<th>Destination</th>
<th>Departure</th>
<th>Offer Requests</th>
</tr>
<tr>
<td>21/01/01 09:00pm</td>
<td>Nairobi</td>
<td>Garissa</td>
<td>27/01/01 07:00am</td>
<td class="requests"><a href="rideofferdetails.html">21</a></td>
</tr>
<tr>
<td>14/01/01 09:00pm</td>
<td>Nairobi</td>
<td>Garissa</td>
<td>17/01/01 07:00am</td>
<td class="requests"><a href="rideofferdetails.html">18</a></td>
</tr>
<tr>
<td>9/01/01 09:00pm</td>
<td>Nairobi</td>
<td>Garissa</td>
<td>11/01/01 07:00am</td>
<td class="requests"><a href="rideofferdetails.html">6</a></td>
</tr>
<tr>
<td>05/01/01 09:00pm</td>
<td>Nairobi</td>
<td>Garissa</td>
<td>06/01/01 07:00am</td>
<td class="requests"><a href="rideofferdetails.html">0</a></td>
</tr>
<tr>
<td>02/01/01 09:00pm</td>
<td>Nairobi</td>
<td>Garissa</td>
<td>03/01/01 07:00am</td>
<td class="requests"><a href="rideofferdetails.html">0</a></td>
</tr>
<tr>
<td>01/01/01 09:00pm</td>
<td>Nairobi</td>
<td>Garissa</td>
<td>02/01/01 07:00am</td>
<td class="requests"><a href="rideofferdetails.html">0</a></td>
</tr>
</table>
<p class="info"><i>*Click the number of requests for more details</i></p>
</div>
</div>
<footer>Made with love by OJ &copy; 2018</footer>
</body>
</html>
50 changes: 50 additions & 0 deletions UI/landingpage.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ride My Way</title>
<link rel="stylesheet" href="static/css/landingpage.css">
<link rel="stylesheet" href="static/css/main.css">
</head>
<body>
<header>
<a href="landingpage.html" class="logo">
RideMyWay
</a>
</header>
<a href="login.html" class="loginbutton">
LOGIN
</a>
<h2 class="slogan">Join the best car pooling club!</h2>
<section class="intro">
<h1>RIDE MY WAY</h1>
<p>
Ride-my App is a carpooling application that provides
drivers with the ability to create ride offers
and passengers to join available ride offers.
</p>
<a href="passengerhome.html"><button class="call-to-action" type="button" name="call-to-action">
SEE RIDES ON OFFER!
</button></a>
</section>
<form class="signupform" action="login.html">
<h2>Join the club by signing up here!</h2>
<hr>
<input type="email" placeholder="username@example.com" name="email" required>
<input type="text" name="username" placeholder="username" required>
<select name="usertype" required>
<option value="driver">Driver</option>
<option value="passenger">Passenger</option>
</select>
<input type="tel" name="contacts" placeholder="Phone Number" required>
<input type="password" placeholder="password" name="password" required>
<input type="password" placeholder="confirm password" name="confirmpassword" required>
<label>
<input type="checkbox" required> I agree to the Terms & Conditions
</label>
<button type="submit" class="signupbutton">Join!</button>
</form>
<footer>Made with love by OJ &copy; 2018</footer>
</body>
</html>
28 changes: 28 additions & 0 deletions UI/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ride My Way</title>
<link rel="stylesheet" href="static/css/main.css">
<link rel="stylesheet" href="static/css/login.css">
</head>
<body>
<header>
<a href="landingpage.html" class="logo">
RideMyWay
</a>
</header>
<a href="landingpage.html" class="signupbutton">
SIGNUP
</a>
<form class="loginform" action="driverhome.html">
<h2>Ride My Way | Login</h2>
<hr>
<input type="text" name="username" placeholder="username" required>
<input type="password" placeholder="password" name="password" required>
<button type="submit" class="login">Login</button>
</form>
<footer>Made with love by OJ &copy; 2018</footer>
</body>
</html>
51 changes: 51 additions & 0 deletions UI/passengerhome.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ride My Way</title>
<link rel="stylesheet" href="static/css/passenger.css">
<link rel="stylesheet" href="static/css/main.css">
</head>
<body>
<header>
<a href="landingpage.html" class="logo">
RideMyWay
</a>
</header>
<a href="userprofile.html" class="profilebutton">
PassengerY
</a>
<a href="landingpage.html" class="loginbutton">
Sign Out
</a>
<br>
<h2 class="welcome">Welcome PassengerY!</h2>
<div class="ridesoffered">
<p class="ridesinfo">Rides currently on offer: 1</p>
<form class="searchform">
<input type="text" placeholder="Search ride by destination.." name="search" class="searchfield">
<button type="submit" name="search" class="searchbutton">Search</button>
</form>
<hr/>
<div class="ridesheader">
<table>
<tr>
<th>Origin</th>
<th>Destination</th>
<th>Departure</th>
<th>Offered</th>
</tr>
<tr class="rideoffer">
<td><a href="ridedetails.html">Nairobi</a></td>
<td><a href="ridedetails.html">Garissa</a></td>
<td><a href="ridedetails.html">21/01/01 09:00pm</a></td>
<td><a href="ridedetails.html">27/01/01 07:00am</a></td>
</tr>
</table>
<p class="info"><i>*Click a ride to reveal more details</i></p>
</div>
</div>
<footer>Made with love by OJ &copy; 2018</footer>
</body>
</html>
40 changes: 40 additions & 0 deletions UI/ridedetails.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ride My Way | Add Offer</title>
<link rel="stylesheet" href="static/css/main.css">
<link rel="stylesheet" href="static/css/ridedetails.css">
</head>
<body>
<header>
<a href="landingpage.html" class="logo">
RideMyWay
</a>
</header>
<a href="userprofile.html" class="profilebutton">
OJ
</a>
<a href="landingpage.html" class="loginbutton">
Sign Out
</a>
<br>
<form class="offerform" action="passengerhome.html">
<div class="ridedetails">
<div><h2>Nairobi to Garissa</h2></div>
<div><label>Driver: </label><i>OJ</i></div>
<div><label>Offer ID: </label><i>id01</i></div>
<div><label>Departure: </label><i>05/01/01 07:00am</i></div>
<div><label>Contribution: </label><i>Ksh. 350</i></div>
<div><label>Capacity: </label><i>4</i></div>
<div><label>Vehicle Type: </label><i>Bentley</i></div>
<div><label>Vehicle No. Plate: </label><i>KBC-A21</i></div>
</div>
<textarea name="drivernotes" rows="10" cols="50" placeholder="Driver notes.." disabled></textarea>
<button type="submit" name="request" class="add">REQUEST</button>
<label>01/01/01 09:00pm</label>
</form>
<footer>Made with love by OJ &copy; 2018</footer>
</body>
</html>
Loading

0 comments on commit 85f91ce

Please sign in to comment.