Fixed Password visibility issue

.github/workflows/python_syntax_check.yml

@@ -18,5 +18,4 @@ jobs:
       - run: pytest . || true
       - run: pytest --doctest-modules . || true
       - run: shopt -s globstar && pyupgrade --py36-plus **/*.py || true
-      - run: safety check
 

.github/workflows/testcases.yml

@@ -7,9 +7,17 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
       - uses: actions/checkout@v3
-      - run: pip install -r requirements.txt || true
-      - run: python manage.py test
-      - run: pip install coverage
+      - run: pip3 install virtualenv
+      - run: mkdir packTravel
+      - run: cd packTravel
+      - run: virtualenv newenv
+      - run: source newenv/bin/activate
+      - run: pip3 install -r requirements.txt
+      - run: pip3 install django
+      - run: pip3 install django-allauth
+      - run: pip3 install pymongo
+      - run: python3 manage.py test
+      - run: pip3 install coverage
       - run: coverage run ./manage.py test
 
       - name: Upload coverage to Codecov

.gitignore

@@ -108,6 +108,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
+test_env/
 .env
 .venv
 env/

PackTravel/settings.py

@@ -25,8 +25,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
-
+ALLOWED_HOSTS = ['44.206.227.12:8000', '127.0.0.1']
 
 # Application definition
 
@@ -37,6 +36,12 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.sites',
+    # django-allauth apps
+    'allauth',
+    'allauth.account',
+    'allauth.socialaccount',
+    'allauth.socialaccount.providers.google', # for Google OAuth 2.0
 ]
 
 MIDDLEWARE = [
@@ -122,8 +127,30 @@
 ]
 
 LOGIN_REDIRECT_URL = '/'
+LOGIN_URL = 'login/'
+LOGOUT_URL = 'logout/'
+LOGOUT_REDIRECT_URL = 'login/'
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+AUTHENTICATION_BACKENDS = [
+    'django.contrib.auth.backends.ModelBackend',
+    'allauth.account.auth_backends.AuthenticationBackend'
+]
+
+SITE_ID = 2
+
+SOCIALACCOUNT_PROVIDERS = {
+    'google': {
+        'SCOPE': [
+            'profile',
+            'email',
+        ],
+        'AUTH_PARAMS': {
+            'access_type': 'online',
+        }
+    }
+}

PackTravel/urls.py

@@ -14,22 +14,28 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
 from user import views as userView
 from search import views as searchViews
 from publish import views as publishViews
+from django.contrib.auth.views import LogoutView
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('search/', searchViews.search_index, name = 'search'),
     path('publish/', publishViews.publish_index, name = 'publish'),
     path('index/', userView.index, name ='index'),
+    path('', userView.index, name ='index'),
     path('index/<username>',userView.index, name='index'),
     path('register/', userView.register, name='register'),
     path('logout/', userView.logout, name='logout'),
     path('login/', userView.login, name='login'),
-    path('create_ride/', publishViews.create_ride, name='create_ride'),
-    path('add_route/', publishViews.add_route, name='add_route'),
+    path('create_route/', publishViews.create_route, name='create_route'),
+    # path('add_route/', publishViews.add_route, name='add_route'),
     path('select_route/', publishViews.select_route, name='select_route'),
-    path('display_ride/<ride_id>', publishViews.display_ride, name='display_ride')
+    path('display_ride/<ride_id>', publishViews.display_ride, name='display_ride'),
+    path('accounts/', include('allauth.urls')),
+    path('logout/', LogoutView.as_view()),
+    path('myrides/', userView.my_rides, name = 'search'),
+    path('delete_ride/<ride_id>', userView.delete_ride, name = 'delete_ride')
 ]

Procfile

@@ -0,0 +1 @@
+web gunicorn PackTravel.wsgi:application --log-file -

README.md

@@ -5,69 +5,82 @@
 
 
 
-
-
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7178601.svg)](https://doi.org/10.5281/zenodo.7178601)
-[![codecov](https://codecov.io/gh/amisha-w/PackTravel/branch/main/graph/badge.svg?token=HRFN97UEB7)](https://codecov.io/gh/amisha-w/PackTravel)
-![Python Style Checker](https://github.com/amisha-w/PackTravel/actions/workflows/python_style_checker.yml/badge.svg)
-![Lint Python](https://github.com/amisha-w/PackTravel/actions/workflows/pylint.yml/badge.svg)
+[![codecov](https://codecov.io/gh/amisha-w/PackTravel/branch/main/graph/badge.svg?token=HRFN97UEB7)](https://codecov.io/gh/Prachit99/PackTravel)
+![Python Style Checker](https://github.com/Prachit99/PackTravel/actions/workflows/python_style_checker.yml/badge.svg)
+![Lint Python](https://github.com/Prachit99/PackTravel/actions/workflows/pylint.yml/badge.svg)
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=for-the-badge)](https://opensource.org/licenses/MIT) 
-[![contributors](https://img.shields.io/github/contributors/amisha-w/PackTravel?style=for-the-badge)](https://github.com/amisha-w/PackTravel/graphs/contributors)
-[![Total Lines](https://img.shields.io/tokei/lines/github/amisha-w/PackTravel?style=for-the-badge)](https://img.shields.io/tokei/lines/github/amisha-w/PackTravel)
-[![Issues](https://img.shields.io/github/issues/amisha-w/PackTravel?style=for-the-badge)](https://github.com/amisha-w/PackTravel/issues)
-[![Closed Issues](https://img.shields.io/github/issues-closed-raw/amisha-w/PackTravel?style=for-the-badge)](https://github.com/amisha-w/PackTravel/issues?q=is%3Aissue+is%3Aclosed)
-[![Pull Requests](https://img.shields.io/github/issues-pr/amisha-w/PackTravel?style=for-the-badge)](https://github.com/amisha-w/PackTravel/pulls)
-[![Commit Acitivity](https://img.shields.io/github/commit-activity/w/amisha-w/PackTravel?style=for-the-badge)](https://github.com/amisha-w/PackTravel/graphs/commit-activity)
-[![Repo Size](https://img.shields.io/github/repo-size/amisha-w/PackTravel?style=for-the-badge)](https://github.com/amisha-w/PackTravel)
+[![contributors](https://img.shields.io/github/contributors/Prachit99/PackTravel?style=for-the-badge)](https://github.com/Prachit99/PackTravel/graphs/contributors)
+[![Total Lines](https://img.shields.io/tokei/lines/github/Prachit99/PackTravel?style=for-the-badge)](https://img.shields.io/tokei/lines/github/Prachit99/PackTravel)
+[![Issues](https://img.shields.io/github/issues/Prachit99/PackTravel?style=for-the-badge)](https://github.com/Prachit99/PackTravel/issues)
+[![Closed Issues](https://img.shields.io/github/issues-closed-raw/Prachit99/PackTravel?style=for-the-badge)](https://github.com/Prachit99/PackTravel/issues?q=is%3Aissue+is%3Aclosed)
+[![Pull Requests](https://img.shields.io/github/issues-pr/Prachit99/PackTravel?style=for-the-badge)](https://github.com/Prachit99/PackTravel/pulls)
+[![Commit Acitivity](https://img.shields.io/github/commit-activity/w/Prachit99/PackTravel?style=for-the-badge)](https://github.com/Prachit99/PackTravel/graphs/commit-activity)
+[![Repo Size](https://img.shields.io/github/repo-size/Prachit99/PackTravel?style=for-the-badge)](https://github.com/Prachit99/PackTravel)
 
 
 </div>
-<h1>🏆 Goal</h1>
-
-_Travelling alone?_ **Try PackTravel**
 
+## Flaws in Phase 1
 
-**Project Description:**
-
-Most of the university students do not have a car to travel off-campus and rely mostly on the Wolfline. But what if someone wants to travel outside Wolfline's limit? Well... why not collaborate on PackTravel to travel off-campus by a cab, rental car, etc.
+- Only basic sign-up/login option which used to break multiple times.
+- One was able to create Rides as well as Routes which would create a lot of data redundancy and multiple rides and routes even for the same source to destination travel ultimately causing more confusion to users.
+- No scope of deleting or cancelling a ride or route.
+- No scope for the user to track his/her rides creating problems for the user track his/her rides and routes and plan accordingly.
+- Application was running only on local servers. Not deployed so very less usability scope as well as very less server support.
 
 
+https://user-images.githubusercontent.com/18501895/205809978-14a5c1c0-65a3-4171-b6f2-f30449325088.mp4
 
-<img style="width: 320px; height: 200px;" src="https://user-images.githubusercontent.com/111834635/194171695-02f5bda6-af44-4e9e-a1a5-4d734c7af5de.jpg" alt=""/>
+## Enhancement and Improvements in Phase 2:
+-  Restructed the database and object structure to improve efficiency and avoid data redundancy. 
+- Users can create or join routes which would create or map the rides automatically based on the source and destination avoiding duplicate data and data redundancy.
+-  Added User based Rides Page which would help the user to track his rides and work on it accordingly. 
+- Added Google SSO Sign in functionality to add options to signing up which also covers security loopholes.
+- Added delete/cancel ride functionality so that if the user has cancelled his plan of going to a particular destination, he/she can cancel/delete the ride so that others are not dependent on the same creating efficient and easy usability for the users.
+- Deployed and Hosted the application on AWS making the application more stable, globally acccessible and not dependent on any local machine.
 
-**So, let's PackTravel 😎**
 
-<h1>Features</h1>
+<h2>What is Packtravel?</h2>
 
-<ul>
-  <li>Create a PackTravel Ride</li>
-  <li>Create mmultiple routes to reach a ride's destination:  Bus, Cab or Personal</li>
-  <li>Search and view other's rides</li>
-  <li>Join a PackTravel Ride's route</li>
-
-</ul>
+Most of the university students do not have a car to travel off-campus and rely mostly on the Wolfline. But what if someone wants to travel outside Wolfline's limit? Well... why not collaborate on PackTravel to travel off-campus by a cab, rental car, etc.
 
-## 🚀 A bit abut PackTravel
+**So, let's go for Packtravel**
 
 https://user-images.githubusercontent.com/111834635/194171771-962a585e-5dc7-4ea3-af35-732ebd34e76c.mp4
 
 **Built Using:**
 </br>
+<code><a href="https://www.python.org/" target="_blank"><img height="50" src="https://user-images.githubusercontent.com/111834635/194173533-37cd4997-55f3-4bb1-87bd-1a16a3af53aa.png"></a></code>
+<code><a href="https://www.djangoproject.com/" target="_blank"><img height="50" src="https://user-images.githubusercontent.com/111834635/194172149-ff6a56be-3025-4d2c-8cdb-b9a7e3f87259.png"></a></code>
+<code><a href="https://www.mongodb.com/" target="_blank"><img height="50" src="https://user-images.githubusercontent.com/111834635/194173280-628ecfc0-21ae-4870-8e22-711e6da83820.png"></a></code>
 <code><a href="https://developer.mozilla.org/en-US/docs/Glossary/HTML5" target="_blank"><img height="50" src="https://www.vectorlogo.zone/logos/w3_html5/w3_html5-ar21.svg"></a></code>
 <code><a href="https://developer.mozilla.org/en-US/docs/Web/CSS" target="_blank"><img height="50" src="https://www.vectorlogo.zone/logos/w3_css/w3_css-ar21.svg"></a></code>
-<code><a href="https://getbootstrap.com/" target="_blank"><img height="50" src="https://www.vectorlogo.zone/logos/getbootstrap/getbootstrap-ar21.svg"></a></code>
 <code><a href="https://www.javascript.com/" target="_blank"><img height="50" src="https://www.vectorlogo.zone/logos/javascript/javascript-ar21.svg"></a></code>
-<code><a href="https://www.djangoproject.com/" target="_blank"><img height="50" src="https://user-images.githubusercontent.com/111834635/194172149-ff6a56be-3025-4d2c-8cdb-b9a7e3f87259.png"></a></code>
-<code><a href="https://www.mongodb.com/" target="_blank"><img height="50" src="https://user-images.githubusercontent.com/111834635/194173280-628ecfc0-21ae-4870-8e22-711e6da83820.png"></a></code>
-<code><a href="https://www.python.org/" target="_blank"><img height="50" src="https://user-images.githubusercontent.com/111834635/194173533-37cd4997-55f3-4bb1-87bd-1a16a3af53aa.png"></a></code>
+<code><a href="https://getbootstrap.com/" target="_blank"><img height="50" src="https://www.vectorlogo.zone/logos/getbootstrap/getbootstrap-ar21.svg"></a></code>
 
+<h2>Scalability</h2>
 
+How can we scale this project? What are the shortcomings which can be covered if we scale it? Everything answered and explained in the in-detailed document attached below.
 
+<a href="https://github.com/Prachit99/PackTravel/blob/36a6b9848f74c52ebe0ccedfef6c0846d98a230d/scalability.md" target="_blank">Click here to know about Scaling this project to the next level</a>
 
-## 📖 Getting started:
+<h2>Features</h2>
 
-### 👤 Who can use our app</h1>
+<ul>
+  <li>Create a PackTravel Ride</li>
+  <li>Create mmultiple routes to reach a ride's destination:  Bus, Cab or Personal</li>
+  <li>Search and view other's rides</li>
+  <li>Join a PackTravel Ride's route</li>
+  <li>Check all your rides</li>
+  <li>Modify your Ride</li>
+  <li> Delete a Ride</li>
+
+</ul>
+
+
+<h2> Who can use our app?</h2>
 
   1. If you are a user who is visiting our app, you can sign up as a user with view access to rides. You can edit or create your own ride.
   2. If you are an admin user, you can create, view, update and delete rides and schedule rides.
@@ -82,23 +95,23 @@ https://user-images.githubusercontent.com/111834635/194171771-962a585e-5dc7-4ea3
 Create a virtual environment:
 
 ```bash
-  python3.x -m venv test_env
+  python3.x -m venv env
 ```
 
 Activate the virtual environment:
 Linux/MacOS:
 ```bash
-  source test_env/bin/activate
+  source env/bin/activate
 ```
 Windows:
 ```bash
-  ./test_env/Scripts/activate
+  ./env/Scripts/activate
 ```
 
 Clone the project
 
 ```bash
-  git clone https://github.com/amisha-w/PackTravel.git
+  git clone https://github.com/Prachit99/PackTravel.git
 ```
 
 Go to the project directory
@@ -122,85 +135,54 @@ Start the server
 
 
 
-     - Site will be hosted at:
-       `http://127.0.0.1:5000/`
+     - Site gets hosted at:
+       `http://127.0.0.1:8000/`
 
-## 🛠️ Tools
+## Tools
 - [Preetier Code Formatter](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 - [JS-HTML-CSS Formatter](https://marketplace.visualstudio.com/items?itemName=lonefy.vscode-JS-CSS-HTML-formatter)
 - [PyLint](https://pylint.org/)
 
-## 🧑‍💻 Functionalities in Action 
+## Functionalities in Action 
+
+- **Sign Up Page**
+<img src="/images/Register.gif" width="800" height="400"/>
 
 - **Login Page**
-![](https://github.com/amisha-w/PackTravel/blob/main/images/Login%20(1).gif)
+<img src="/images/Login%20(1).gif" width="800" height="400"/>
 
 - **Creating a Ride**
-![](https://github.com/amisha-w/PackTravel/blob/main/images/Create1.gif)
-![](https://github.com/amisha-w/PackTravel/blob/main/images/Create2.gif)
-
-- **Search for a Ride**
-![](https://github.com/amisha-w/PackTravel/blob/main/images/Search.gif)
-
-- **Joining an existing Ride**
-![](https://github.com/amisha-w/PackTravel/blob/main/images/JoinRide.gif)
+<img src="/images/Create1.gif" width="800" height="400"/>
+<img src="/images/Create2.gif" width="800" height="400"/>
 
 - **Adding New Route**
-![](https://github.com/amisha-w/PackTravel/blob/main/images/AddRoute11.gif)
-![](https://github.com/amisha-w/PackTravel/blob/main/images/AddRoute12.gif)
-
-- **Sign Up Page**
-![](https://github.com/amisha-w/PackTravel/blob/main/images/Register.gif)
-
-
-
+<img src="/images/AddRoute11.gif" width="800" height="400"/>
+<img src="/images/AddRoute12.gif" width= "800" height="400"/>
 
-## 💬 Chat Channel
+- **Search for a Ride**
+<img src="/images/Search.gif" width="800" height="400"/>
 
-<code><a href="https://app.slack.com/client/T03UZM4975G/C03UT3QFHP0" target="_blank"><img height="50" width="100" src="https://user-images.githubusercontent.com/111834635/194175304-834d5663-b6bb-4e38-981d-98bc1bf028b8.png"></a></code>
+- **My Rides**
 
+<img src="/images/myRides.gif" width="800" height="400"/>
 
-### 🎯 Phase 1:
 
-- [x] Create database ER diagram
-- [x] Create Mongo Database
-- [x] Create HomePage
-- [x] Create Login and Signup Page
-- [x] Create Search Page
-- [x] Added create Rides Page
-- [x] Added create routes Page
-- [x] Setup Django
-- [x] Add Unit testing
-- [x] Add Error Handling mechanisms
-- [x] Setup Workflows
 
-### 🎯 Future Enhancements:
+## Chat Channel
 
-- [ ] Add machine learning algorithms for predicting lowest priced rides, best pickup and drop-off locations.
-- [ ] Add functionality to merge routes
-- [ ] Show later departures in search if currently searched rides is not available
-- [ ] Increase the geographical area coverage for the application
-- [ ] Extend the userbase to students other than that of the North Carolina State University
-- [ ] Integrate in-app cab booking services
-- [ ] Introduce a two way ride confirmation feature
+<code><a href="https://seproject-bvz2267.slack.com/archives/C045KE3RW9L" target="_blank"><img height="50" width="100" src="https://user-images.githubusercontent.com/111834635/194175304-834d5663-b6bb-4e38-981d-98bc1bf028b8.png"></a></code>
 
-## Contributions to the Project
 
-## 👨‍🏭 Contributors 
+## Contributors 
 
 <table>
   <tr>
-    <td align="center"><a href="https://github.com/amisha-w"><img src="https://avatars.githubusercontent.com/u/40361766?v=4" width="100px;" alt=""/><br /><sub><b>Amisha Waghela</b></sub></a></td>
-    <td align="center"><a href="https://github.com/Aoishi28"><img src="https://avatars.githubusercontent.com/u/60925790?v=4" width="100px;" alt=""/><br /><sub><b>Aoishi Das</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/ameyachavan26"><img src="https://avatars.githubusercontent.com/u/111834635?v=4" width="100px;" alt=""/><br /><sub><b>Ameya Chavan</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/kunalshah03"><img src="https://avatars.githubusercontent.com/u/48029057?v=4" width="100px;" alt=""/><br /><sub><b>Kunal Shah</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/swarnamalyamohan"><img src="https://avatars.githubusercontent.com/u/45752623?v=4" width="100px;" alt=""/><br /><sub><b>Swarnamalya M</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/Prachit99"><img src="https://avatars.githubusercontent.com/Prachit99" width="100px;" alt=""/><br /><sub><b>Prachit99</b></sub></a></td>
+    <td align="center"><a href="https://github.com/Darkspur"><img src="https://avatars.githubusercontent.com/Darkspur" width="100px;" alt=""/><br /><sub><b>Sahil Sawant Joshi</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/ashishjoshi2605"><img src="https://avatars.githubusercontent.com/ashishjoshi2605" width="100px;" alt=""/><br /><sub><b>Ashish Joshi</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/sankettangade"><img src="https://avatars.githubusercontent.com/sankettangade" width="100px;" alt=""/><br /><sub><b>Sanket Tangade</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/karan-47"><img src="https://avatars.githubusercontent.com/karan-47" width="100px;" alt=""/><br /><sub><b>Karan Gala</b></sub></a><br /></td>
   </tr>
 </table>
 
 
-<h1>❗ TroubleShooting and Help Guide</h1>
-
- 1. For any issues faced while using the application, please email the detailed description and steps to reproduce the error at [email protected] .
- 2. If you are a developer, please raise an issue on github with steps to reproduce and possible source of error.
- 3. Our email is monitored 24x7 and we usually respond within 1 hour. Happy Emailing :).

publish/forms.py

@@ -7,8 +7,8 @@
 class RideForm(forms.ModelForm):
     destination = forms.CharField(required=True, widget=forms.TextInput(attrs={'placeholder':
     'Enter your start destination', 'class': 'form-control'}))
-    rideDate = forms.CharField(required=True, widget=forms.TextInput(attrs={'placeholder':
-    'Enter ride date', 'class': 'form-control'}))
+    # rideDate = forms.CharField(required=True, widget=forms.TextInput(attrs={'placeholder':
+    # 'Enter ride date', 'class': 'form-control'}))
 
 # unityid = 
 # forms.CharField(required=True,