Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
e40bb75
Refactored the code so that we don't have so much redudant html. Also…
kwiatk67 Nov 10, 2023
3e6659d
Added login page and signup page. Added lots of supporting code inclu…
kwiatk67 Nov 14, 2023
2b4c17e
Removed excess bloat in the code.
kwiatk67 Nov 15, 2023
3a1d017
Merge pull request #4 from tanmaypardeshi/Log_In/Out
tanmaypardeshi Nov 15, 2023
39c8459
Update codecoverage.yml
tanmaypardeshi Nov 17, 2023
b8c5378
Merge pull request #11 from tanmaypardeshi/update-codecov-token
ExtremeMachine12 Nov 18, 2023
23c78b4
Refactoring of code done
tanmaypardeshi Nov 19, 2023
3f42ad7
Updated README.md
tanmaypardeshi Nov 19, 2023
6ad5215
Search page validation
tanmaypardeshi Nov 19, 2023
0bf8a80
Requirements updates
tanmaypardeshi Nov 19, 2023
3e8efdf
Fixed unit tests
tanmaypardeshi Nov 19, 2023
66cb737
Improved workflow
tanmaypardeshi Nov 19, 2023
344fe0b
Improved workflow
tanmaypardeshi Nov 19, 2023
a01503d
Fixing workflow files
tanmaypardeshi Nov 19, 2023
3421d29
Fixing pylint
tanmaypardeshi Nov 19, 2023
8f9b061
Fixing pylint
tanmaypardeshi Nov 19, 2023
3dcf0d9
Fixing pylint
tanmaypardeshi Nov 19, 2023
a0aab3f
Merge pull request #13 from tanmaypardeshi/small-fixes
ExtremeMachine12 Nov 19, 2023
5e1bd64
Trying to fix pylint
tanmaypardeshi Nov 19, 2023
5040a23
Trying to fix pylint
tanmaypardeshi Nov 19, 2023
8c84912
Trying to fix pylint by writing all pip install in the code
tanmaypardeshi Nov 19, 2023
795a4b3
Merge pull request #19 from tanmaypardeshi/small-fixes
ExtremeMachine12 Nov 20, 2023
8109838
Fixed the search and predict issue
tanmaypardeshi Nov 21, 2023
18d1b03
Fixed the search and predict issue
tanmaypardeshi Nov 21, 2023
5afa71c
Merge pull request #22 from tanmaypardeshi/small-fixes
tanmaypardeshi Nov 21, 2023
910ae61
Created user profile page
tanmaypardeshi Nov 21, 2023
8887dc3
Added a file to initialize the database. Also added components such t…
kwiatk67 Nov 24, 2023
f3aa0c9
Made few changes
tanmaypardeshi Nov 25, 2023
d794366
Improved search page UI
tanmaypardeshi Nov 25, 2023
3650c73
Improved search page UI
tanmaypardeshi Nov 25, 2023
16a51fb
Added movie ID to API for future use
tanmaypardeshi Nov 25, 2023
30252f9
Added chat page with socket connections.
kwiatk67 Nov 25, 2023
8f5c63c
Chat page is now fully functional.
kwiatk67 Nov 26, 2023
a7d9d7e
Fixed pylint errors
kwiatk67 Nov 26, 2023
c621800
Merge pull request #24 from tanmaypardeshi/Movie_Chat
abhinav110595 Nov 26, 2023
4b8bcf3
Fixed testcases
tanmaypardeshi Nov 26, 2023
c0e031c
Added chat in user-profile branch
tanmaypardeshi Nov 26, 2023
6dd0a10
Fixed pylint
tanmaypardeshi Nov 26, 2023
38abc42
Fixed minor issues
tanmaypardeshi Nov 26, 2023
efa7a74
Fixed codecov badge
tanmaypardeshi Nov 26, 2023
b602fcc
Merge pull request #23 from tanmaypardeshi/user-profile
abhinav110595 Nov 26, 2023
974ee4c
adding movie poster to the recommended movies
Nov 27, 2023
96c5158
adjusting the size of the poster
Nov 27, 2023
c32dc5a
Merge pull request #25 from tanmaypardeshi/movie_posterV2
tanmaypardeshi Nov 27, 2023
e9b8533
Reviews are getting saved
tanmaypardeshi Nov 27, 2023
5e8a5f1
Fixed merge conflicts
tanmaypardeshi Nov 27, 2023
23c691d
Done with writing get movies API
tanmaypardeshi Nov 27, 2023
4855f53
Reviews done
tanmaypardeshi Nov 27, 2023
a94b132
Merge pull request #26 from tanmaypardeshi/reviews
ExtremeMachine12 Nov 27, 2023
e891854
NewMovie Tab
cray94 Nov 27, 2023
97a3002
Add files via upload
ExtremeMachine12 Nov 27, 2023
89a3a1c
Merge pull request #27 from tanmaypardeshi/System-Architecture
tanmaypardeshi Nov 27, 2023
5268037
Fixing links - 1
tanmaypardeshi Nov 27, 2023
eeb931e
Working on updates
tanmaypardeshi Nov 27, 2023
eed3f2c
resolved merge conflicts
tanmaypardeshi Nov 27, 2023
9edbb01
Pulled from master
tanmaypardeshi Nov 27, 2023
9874475
Handled exception
tanmaypardeshi Nov 27, 2023
35751fc
New Movies Fix
tanmaypardeshi Nov 27, 2023
9443613
Merge pull request #29 from tanmaypardeshi/newMovies
abhinav110595 Nov 27, 2023
054c502
Merge branch 'master' of https://github.com/tanmaypardeshi/CSC-510-Pr…
tanmaypardeshi Nov 27, 2023
8443b8d
Passed current user to new movies page
tanmaypardeshi Nov 27, 2023
98ad191
Updated tech stack with sqlite
tanmaypardeshi Nov 27, 2023
0bf64cf
Updated future scope
tanmaypardeshi Nov 28, 2023
7f63031
Changed CONTRIBUTING.md
tanmaypardeshi Nov 28, 2023
e784210
Updated future scope
tanmaypardeshi Nov 28, 2023
7e7a00e
More updates on README:
tanmaypardeshi Nov 28, 2023
1bd589b
Updated future scope
tanmaypardeshi Nov 28, 2023
f7d428c
Almost done with README.md
tanmaypardeshi Nov 28, 2023
99a0b21
GIFS Left
tanmaypardeshi Nov 28, 2023
5b6f479
Add files via upload
ExtremeMachine12 Nov 28, 2023
591f188
Add files via upload
ExtremeMachine12 Nov 28, 2023
579c64b
Add files via upload
ExtremeMachine12 Nov 28, 2023
4609a4f
Movie poster
abhinav110595 Nov 28, 2023
0b4107b
Added pictures to the pages
tanmaypardeshi Nov 28, 2023
83884d6
Merge branch 'documentation-updates' of https://github.com/tanmaypard…
tanmaypardeshi Nov 28, 2023
dd10fa8
Add files via upload
abhinav110595 Nov 28, 2023
d2c0bed
Initial Draft
cray94 Nov 28, 2023
5205f8e
Add files via upload
abhinav110595 Nov 28, 2023
f64c24d
Update README.md
cray94 Nov 28, 2023
2f6282d
Add files via upload
abhinav110595 Nov 28, 2023
585204c
Add files via upload
abhinav110595 Nov 28, 2023
a8782c9
Final Draft
cray94 Nov 28, 2023
7c8815e
Updated README.md(final)
tanmaypardeshi Nov 28, 2023
11b25ca
Final GIF
tanmaypardeshi Nov 28, 2023
ee63fd4
Fixed CONTRIBUTING.md
tanmaypardeshi Nov 28, 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
22 changes: 9 additions & 13 deletions .github/workflows/codecoverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,25 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.8 # Replace '3.x' with your desired Python version
python-version: 3.10.12 # Replace '3.x' with your desired Python version

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
pip install pandas
pip install -U Flask
pip install -U flask-cors
pip install pytest
pip install pytest-cov
pip install -r requirements.txt

- name: Run tests and generate coverage
run: |
cd test
coverage run --source=test -m pytest test_*.py
cd app
coverage run --source=test -m pytest test/test_*.py
coverage xml -i

- name: Upload coverage report to Codecov
run: |
bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
uses: codecov/codecov-action@v3
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
15 changes: 10 additions & 5 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -17,10 +17,15 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
pip install -r requirements.txt
pip install flask
pip install flask_sqlalchemy
pip install flask_login
pip install flask_cors
pip install pandas
pip install -U Flask
pip install -U flask-cors
pip install numpy
pip install pylint
- name: Analysing the code with pylint
run: |
pylint $(git ls-files '*.py')
cd app
pylint src
19 changes: 11 additions & 8 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8"]
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand All @@ -17,14 +17,17 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
pip install pandas
pip install -U Flask
pip install -U flask-cors
pip install -r requirements.txt
- name: Running test cases for predicting
run: python test/test_predict.py
run: |
cd app
python test/test_predict.py
- name: Running test cases for searching
run: python test/test_search.py
run: |
cd app
python test/test_search.py
- name: Running test cases for util
run: python test/test_util.py
run: |
cd app
python test/test_util.py

86 changes: 42 additions & 44 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
## Contributing:

* If you would like to contribute and collaborate with this repository, then please inform us through email at popcornpicks504@gmail.com.

## Purpose of Contributing:
### Purpose of Contributing:

* To develop our product and take it to the next level.
* To enhance the already existing feature.
Expand All @@ -13,46 +11,46 @@
* Help us to scale the system to a larger database
* To run the email notifier feature - make your own Gmail account and password and replace the same in the utils.py(function: send_email_to_user(recipient_email, categorized_data))

## Our Table Of Contents

- .github/workflows
- all GitHub workflow YAML files
- proj2
- score_card.md
- src
- prediction_scripts
- item_based.py
- recommenderapp
- static
- script.js
- stylesheet.css
- templates
- landing_page.html
- search_page.html
- success.html
- app.py
- search.py
- utils.py
- test
- test_predict.py
- test_search.py
- test_util.py
- .gitignore

- CODE_OF_CONDUCT.md

- CONTRIBUTING.md

- LICENSE

- README.md

- requirements.txt

- setup.py
### Our Table Of Contents
```
.
├── app
│ ├── init_db.py
├── instance
│ │ └── site.db
│ ├── run.py
│ ├── src
│ ├── __init__.py
│ │ ├── item_based.py
│ ├── models.py
├── __pycache__
├── routes.py
│ ├── search.py
├── static
├── templates
└── utils.py
└── test
├── __init__.py
├── __pycache__
│ ├── test_predict.py
│ ├── test_search.py
└── test_util.py
├── asset
├── demo.gif
│ ├── email.png
│ ├── execution.gif
│ ├── group12.png
│ ├── header_display.png
│ ├── system_architecture.svg
│ └── SystemArch.png
├── CODE_OF_CONDUCT.md
├── CONTRIBUTING.md
├── data
│ └── movies.csv
├── LICENSE
├── README.md
└── requirements.txt
```

## Suggesting Enhancements

Expand Down Expand Up @@ -89,7 +87,7 @@ Any suggested enhancements like adding new features or improving existing functi

## Code of Conduct:

* Please go through the [Code of Conduct](https://github.com/adipai/PopcornPicks/blob/master/CODE_OF_CONDUCT.md) before you begin contributing. This project and everyone participating in it is governed by the Code of Conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to popcornpicks504@gmail.com.
* Please go through the [Code of Conduct](https://github.com/tanmaypardeshi/PopcornPicks/blob/master/CODE_OF_CONDUCT.md) before you begin contributing. This project and everyone participating in it is governed by the Code of Conduct. By participating, you are expected to uphold this code. Please report unacceptable behavior to popcornpicks504@gmail.com.

## Pull Request Submission Guidelines

Expand Down
10 changes: 5 additions & 5 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Aditya Pai, Ananya Mantravadi, Rishi Singhal, Samarth Shetty
Copyright (c) 2023 Abhinav Sinha, Chandana Ray, Sam Kwiatkowski-Martin, Tanmay Pardeshi

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -15,7 +15,7 @@ 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
ORIGINAL 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 ORIGINAL SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE ORIGINAL SOFTWARE OR THE NEW EXTENSIONS.
ORIGINAL 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 ORIGINAL SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE ORIGINAL SOFTWARE OR THE NEW EXTENSIONS.
Loading