Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
ba310b5
almost done
Gerald-ux-ux Jan 9, 2023
9824bc9
almost done
Gerald-ux-ux Jan 9, 2023
c955bb4
almost done
Gerald-ux-ux Jan 10, 2023
c6b9e15
almost done
Gerald-ux-ux Jan 10, 2023
3608f66
almost done
Gerald-ux-ux Jan 10, 2023
98fa31f
almost done
Gerald-ux-ux Jan 11, 2023
0d997d8
login page
Gerald-ux-ux Jan 11, 2023
317b50c
login page
Gerald-ux-ux Jan 12, 2023
e5e69af
Merge pull request #1 from MaureenMurugi/gerald
MaureenMurugi Jan 13, 2023
ba89db1
login page
Gerald-ux-ux Jan 16, 2023
9dba935
functionalities coming together
Gerald-ux-ux Jan 16, 2023
cdb636a
Merge pull request #3 from MaureenMurugi/gerald
MaureenMurugi Jan 17, 2023
c153cb2
Added the dashboard
MaureenMurugi Jan 17, 2023
ee87d37
g
Gerald-ux-ux Jan 17, 2023
b5af641
fixing auth for user and admin
Jackson-Kahono Jan 18, 2023
f8feeea
cleaning up...
Jackson-Kahono Jan 18, 2023
81b4598
testing depl
Jackson-Kahono Jan 18, 2023
282abaf
fixes
Jackson-Kahono Jan 18, 2023
374565f
resize
Gerald-ux-ux Jan 18, 2023
3f6f352
Added an aboutus page
MaureenMurugi Jan 19, 2023
7c6c4e9
Downstyled the dashboard, updated the table to buses
MaureenMurugi Jan 19, 2023
a300557
Add readme
MaureenMurugi Jan 19, 2023
b77e9fc
Update README.md
MaureenMurugi Jan 19, 2023
3d86546
Merging...
Jackson-Kahono Jan 20, 2023
cb0edb8
Merging...
Jackson-Kahono Jan 20, 2023
92acf57
Merging...
Jackson-Kahono Jan 20, 2023
df43679
resolving conflicts k
Jackson-Kahono Jan 20, 2023
64ae4e3
Merge branch 'murugi' of https://github.com/MaureenMurugi/BRT into ka…
Jackson-Kahono Jan 20, 2023
be3286b
merge with g
Jackson-Kahono Jan 20, 2023
4a1f596
Merged with ma
Jackson-Kahono Jan 20, 2023
bfbaf06
Update README.md
MaureenMurugi Jan 20, 2023
70cb9d6
Changing api url
Jackson-Kahono Jan 20, 2023
730c6ad
Merge branch 'main' of https://github.com/MaureenMurugi/BRT into kahono
Jackson-Kahono Jan 20, 2023
ed5c4bf
Add About us page
MaureenMurugi Jan 22, 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
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# REACT_APP_API_URL=https://modern-burst-production.up.railway.app
128 changes: 58 additions & 70 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,70 +1,58 @@
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `npm test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `npm run build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `npm run eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)

### Deployment

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `npm run build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
# Authors
* Maureen Murugi
* Gerald Kamau
* Jackson Kahono
* Zipporah Kwamboka
* Martin Kamau
* Esther Wanjiku
* Shaniz Nyawira

# Table of contents
1. [Authors](#contributers)
2. [Description](#Description)
3. [Features](Features)
4. [Requirements](#Requirements)
5. [Installation process](#Installation)
6. [Technologies used](#Technologies)
7. [Live links](#Links)
8. [Contact Information](#Contact-Information)
9. [Licence Information](#License)
# Description
> Our system introduces a bus system where one can access the bus routes, with standardized bus fares and different peak points from the comfort of your home on your device. Users can easily see the available buses, the prices, and the specific routes to the CBD.
This will allow users not to waste time in bus stages waiting for the bus, because they are sure of the bus they will board and the exact time and the bus fare, to and from the Thika superhighway to town.

# Features
As a user of the application, you will be able to;
1. Navigate through the application by first creating an account, log in.
2. A user can select a bus, to-and-from destinations,available buses and make payments.
3. On the backend, with rails, the admin is able to create,update and delete the buses available.
4. The admin can have the analytics of how many users, buses and the stations that have the most users.
# Requirements
User must have access to a computer.
User must be connected to the internet.
# Installation Process
Clone the repository: git clone 'https://git@github.com:MaureenMurugi/BRT.git', 'https://git@github.com:Jackson-Kahono/Bus-Transit-Service.git'
Unzip the cloned files in a folder of choice.
# Technologies Used
1. Ruby on Rails - as the dynamic language to interact with ActiveRecords and backend.
2. React JS - Structure to the web application and interaction with the users.
3. SQlite3 - Interactions with the database.
# Live Front-end link
> 'https://bus-transit-services.vercel.app/'
# Live Back-end link
> 'https://modern-burst-production.up.railway.app/'
# Authors Info
github:
>'https://github.com/MaureenMurugi'
>'https://github.com/Jackson-Kahono'
>'https://github.com/123ZOKzok'
>'https://github.com/EstherWMaina'
>'https://github.com/Gerald-ux-ux'
>'https://github.com/Ki-muh'
>'https://github.com/ShanizNyawira'
# License
MIT License
Copyright [2022][Group 2]
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16 changes: 16 additions & 0 deletions db.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"stations": [
{
"station_name":"CBD - Alssops",
"fare": 30
},
{
"station_name":"CBD - Alssops",
"fare": 70
},
{
"station_name": "CBD - Alssops",
"fare": 50
}
]
}
Loading