Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
36bc052
Update README.md
Angel2001-programmer Dec 22, 2023
e3f3b3b
Haiying Profile is removed.
Angel2001-programmer Dec 29, 2023
6a3bd16
Added close button to create post.
Angel2001-programmer Dec 29, 2023
769c5b9
comments added to forums and edit account.
Angel2001-programmer Dec 29, 2023
01f2f54
changed forum date format
Angel2001-programmer Dec 29, 2023
afc20d7
changes to editAccount.
Angel2001-programmer Dec 29, 2023
891de2a
merging readme
Meteorstrike1 Jan 2, 2024
1b39cc4
Merge pull request #2 from Angel2001-programmer/Katherine
Meteorstrike1 Jan 2, 2024
83971a9
Message board functioning on frontend.
Angel2001-programmer Jan 7, 2024
286555a
updated home and forum pages.
Angel2001-programmer Jan 7, 2024
640034e
added images to recommendation db.
Angel2001-programmer Jan 8, 2024
d3c419d
Merge pull request #3 from Angel2001-programmer/Angel
Angel2001-programmer Jan 8, 2024
66b328d
ChatRoom setup successfully
Angel2001-programmer Jan 18, 2024
bca8fef
Merge pull request #4 from Angel2001-programmer/Angel
Angel2001-programmer Jan 18, 2024
951ee40
bug fixed on about page.
Angel2001-programmer Jan 18, 2024
e582a09
updated about page.
Angel2001-programmer Jan 18, 2024
9ee3f01
Merge branch 'Katherine' into Development
Meteorstrike1 Jan 20, 2024
8ca3f15
Merge pull request #6 from Angel2001-programmer/Development
Meteorstrike1 Jan 20, 2024
b8bd2d2
IN-14 Development config renamed, database credentials moved to .env …
Meteorstrike1 Jan 20, 2024
c5f7fc6
Updated Readme
Meteorstrike1 Jan 20, 2024
be49ae6
flask migrate
Meteorstrike1 Jan 26, 2024
8e74b51
Moved routes back to app (temporarily), renamed db introverse_dev, re…
Meteorstrike1 Jan 26, 2024
31d11ff
Added doc strings to table models
Meteorstrike1 Jan 27, 2024
b7187f8
starting new namespace
Meteorstrike1 Jan 27, 2024
3bc91ba
Forgot to change database name in template file
Meteorstrike1 Jan 27, 2024
e5b5cb0
Merge pull request #8 from Angel2001-programmer/flask_rearrange
Meteorstrike1 Jan 27, 2024
cd0ec8b
Converting register user to Resource route and added email validation
Meteorstrike1 Jan 28, 2024
4533763
in progress of updating routes to resource class and making namespace
Meteorstrike1 Jan 28, 2024
d4bef82
Factory function created for app set up with namespaces added. Run fi…
Meteorstrike1 Jan 29, 2024
ba6023e
Split forum into separate namespace, adding additional routes for all…
Meteorstrike1 Jan 30, 2024
b389d94
Deleting unnecessary imports and old copies of files
Meteorstrike1 Jan 30, 2024
0a9dd26
Merge pull request #9 from Angel2001-programmer/flask_rearrange
Meteorstrike1 Jan 31, 2024
069e880
Updated main routes on frontend
Meteorstrike1 Jan 31, 2024
43b801c
Merge pull request #10 from Angel2001-programmer/Katherine
Meteorstrike1 Jan 31, 2024
a0c7de0
wrestling with redux
Meteorstrike1 Feb 1, 2024
ebe1da0
Rough redux implementation, will tidy up next
Meteorstrike1 Feb 2, 2024
098f086
Persist added to redux
Meteorstrike1 Feb 2, 2024
39402ab
Update README.md
Angel2001-programmer Feb 3, 2024
a2fa35b
Trimming the doc strings to make the files more readable
Meteorstrike1 Feb 3, 2024
e567d52
Moved some files for folder clean up and deleted unnecessary ones
Meteorstrike1 Feb 3, 2024
97976f5
Cleaning up, adding comments to do, fixing redux at sign up, updating…
Meteorstrike1 Feb 3, 2024
7456ec1
Merge pull request #12 from Angel2001-programmer/Katherine
Meteorstrike1 Feb 3, 2024
e78f1bc
Merge branch 'main' of https://github.com/Angel2001-programmer/Introv…
Meteorstrike1 Feb 3, 2024
9d26660
Added more pycache to gitignore and deleted the extra folders forgot …
Meteorstrike1 Feb 3, 2024
713098f
Merge pull request #14 from Angel2001-programmer/Katherine
Meteorstrike1 Feb 3, 2024
94f5b4a
Merge pull request #13 from Angel2001-programmer/Development
Meteorstrike1 Feb 3, 2024
1ad9d7c
Setting up for testing, test DB and route added, issue with app creat…
Meteorstrike1 Feb 4, 2024
a2cb5a0
Refactored application factory function for test config, fixed issue …
Meteorstrike1 Feb 5, 2024
fc17fd8
Investigating JWT issue, realised was missing bearer token authorisat…
Meteorstrike1 Feb 10, 2024
c6eac08
Splitting tests into different namespaces and starting a base class f…
Meteorstrike1 Feb 10, 2024
b2575ba
Updating and adding more tests, app renamed main and run app merged i…
Meteorstrike1 Feb 12, 2024
06254d0
Minor comment and .strip() on min length validation
Meteorstrike1 Feb 13, 2024
aa662e4
Minor changes and .strip()
Meteorstrike1 Feb 13, 2024
019d9e6
Merge branch 'Development' of https://github.com/Angel2001-programmer…
Meteorstrike1 Feb 13, 2024
e7991f1
Moved message into forum models. Created file for serialisers
Meteorstrike1 Feb 14, 2024
7b6293d
Updating case on content tables and reverting main.py to app.py
Meteorstrike1 Feb 14, 2024
4407eec
Merge pull request #15 from Angel2001-programmer/Katherine
Meteorstrike1 Feb 14, 2024
b1fad7a
Updating queries on renamed content columns
Meteorstrike1 Feb 15, 2024
aec0e9a
Merge pull request #17 from Angel2001-programmer/Development
Angel2001-programmer Feb 15, 2024
4b089d0
Merge pull request #18 from Angel2001-programmer/Katherine
Meteorstrike1 Feb 15, 2024
4709769
Keeping namespace models and routes in same file. Added load_dotenv o…
Meteorstrike1 Feb 15, 2024
9d1fb57
Adding some descriptions to swagger API documentation
Meteorstrike1 Feb 15, 2024
c969f54
Enabled db to work on my system and linked up backend data on the UI.…
Angel2001-programmer Feb 15, 2024
2b87283
removed MobileNav
Angel2001-programmer Feb 15, 2024
423c42a
remove mobile nav context providers.
Angel2001-programmer Feb 15, 2024
9c7f729
Merge branch 'Development' into Angel
Angel2001-programmer Feb 15, 2024
84ad56a
Merge pull request #19 from Angel2001-programmer/Angel
Angel2001-programmer Feb 15, 2024
7da90e3
Renamed some API classes
Meteorstrike1 Feb 16, 2024
759ca11
intergrating real usernames into the chat, profile to profile.
Angel2001-programmer Feb 27, 2024
394c3ea
Been working on testing put route, not got check for invalid username…
Meteorstrike1 Mar 1, 2024
453d1a5
Renamed function to make purpose more clear
Meteorstrike1 Mar 1, 2024
47059db
Updating descriptions for data transfer objects, still obvious but ad…
Meteorstrike1 Mar 1, 2024
26d8317
Test and edit forum route still not working as intended for different…
Meteorstrike1 Mar 1, 2024
75faf62
For tests created a function for creating a user with a default case …
Meteorstrike1 Mar 1, 2024
27a610d
search function for chat bubble works with first_names
Angel2001-programmer Mar 1, 2024
682fc41
Merge pull request #20 from Angel2001-programmer/Angel
Angel2001-programmer Mar 1, 2024
8a5e8ee
Merge pull request #21 from Angel2001-programmer/Development
Angel2001-programmer Mar 1, 2024
bc9f07c
fixed background on editAccount page.
Angel2001-programmer Mar 1, 2024
305adb3
Merge branch 'Angel' of https://github.com/Angel2001-programmer/Intro…
Angel2001-programmer Mar 1, 2024
3c48153
More tests, put and delete route returning error code fixed, some for…
Meteorstrike1 Mar 6, 2024
c071c56
Renaming custom error message keys to "message" for consistency with …
Meteorstrike1 Mar 9, 2024
49341a2
Checking current user route on frontend too, it didn't need an extra …
Meteorstrike1 Mar 9, 2024
b93fb8c
More user route tests, method for updating dob and interests in profi…
Meteorstrike1 Mar 10, 2024
6758376
Fixed making a fresh access token by using with app context
Meteorstrike1 Mar 10, 2024
744600c
Writing tests for content, added mock data from exported json, separa…
Meteorstrike1 Mar 10, 2024
e867807
Renamed test_api to test_auth_api (class and functions for forum and …
Meteorstrike1 Mar 10, 2024
56f808b
Slight bit of formatting, renaming, tweaking and last few tests - com…
Meteorstrike1 Mar 11, 2024
7df8d7c
Readded create tables file so available if needed, SQLite alternative…
Meteorstrike1 Mar 12, 2024
140acec
Fixing links and removing unused import
Meteorstrike1 Mar 12, 2024
c41a2e6
Updating main project readme and adding link to dedicated backend readme
Meteorstrike1 Mar 12, 2024
0522b6e
Merge pull request #16 from Angel2001-programmer/Katherine
Meteorstrike1 Mar 12, 2024
e310fed
Merge branch 'Development' into flask_review
Meteorstrike1 Mar 12, 2024
38c412d
Merge pull request #22 from Angel2001-programmer/flask_review
Meteorstrike1 Mar 12, 2024
95cb991
Edit account page now works and button only allows submission and not…
Angel2001-programmer Mar 12, 2024
83c507f
Merge branch 'Development' into Angel
Angel2001-programmer Mar 12, 2024
793ca3e
Merge pull request #23 from Angel2001-programmer/Angel
Angel2001-programmer Mar 12, 2024
4c88e50
Merge pull request #24 from Angel2001-programmer/Development
Angel2001-programmer Mar 12, 2024
747d4ea
Slight tweaks/typos in Readme
Meteorstrike1 Mar 12, 2024
f3ecec9
Minor adjustment to use the get response not post response in test fo…
Meteorstrike1 Mar 12, 2024
a2cc4e1
Merge pull request #25 from Angel2001-programmer/Development
Meteorstrike1 Mar 12, 2024
9dafdc9
Getting rid of committed .env file
Meteorstrike1 Mar 12, 2024
a289d89
Merge conflict problems on editprofiledetails, fixed duplicates
Meteorstrike1 Mar 12, 2024
5fd23c7
Merge pull request #26 from Angel2001-programmer/Katherine
Meteorstrike1 Mar 12, 2024
af5e5b6
Merge pull request #27 from Angel2001-programmer/Development
Angel2001-programmer Mar 12, 2024
39fc10e
Forum now filters through database instead of filtering on FE.
Angel2001-programmer Mar 13, 2024
9af3d4f
Merge pull request #29 from Angel2001-programmer/Angel
Angel2001-programmer Mar 13, 2024
21132c5
recommendation now filters through db.
Angel2001-programmer Mar 13, 2024
8bc0218
Merge pull request #30 from Angel2001-programmer/Angel
Angel2001-programmer Mar 13, 2024
4256f21
updated forum
Angel2001-programmer Mar 13, 2024
870e57f
Merge pull request #31 from Angel2001-programmer/Angel
Angel2001-programmer Mar 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

flask-server/.env
flask-server/venv/
flask-server/__pycache__/
**/__pycache__/
*.pyc
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/Introverse.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed Final project document/Project Document Group 1.docx
Binary file not shown.
Binary file removed Final project document/Project Document Group 1.pdf
Binary file not shown.
32 changes: 0 additions & 32 deletions Final project document/PythonREADME.md

This file was deleted.

29 changes: 18 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,35 @@ Follow the following steps to get frontend of application running in your termin
3. npm start
```
```
5. Enjoy exploring our website.
4. Enjoy exploring our website.
```

## Backend
# Backend
See [Flask Readme](flask-server/README.md) for more information
## To set up and run the server
1. Install the required packages with pip
1. Create a virtual python environment (can do this with command or VScode should prompt you when try to run a file) and select it.
```
python -m venv venv
```
2. Install the required packages with pip (or pip3 for mac).
```
pip install -r requirements.txt
```
If you have any issues with modules not being installed properly try pip install manually
If they are installed but the file shows not imported properly try changing the Python interpreter (Ctrl+Shift+P in VS code) and reinstalling if necessary
2. Change mysqlconfig.py to your credentials
3. Create the database if does not already exist - either through the SQL script or with Python
To create from Python run the create_db.py file
3. Set up the .env file, can create a copy of (or rename) .env.example and save as .env. Follow the instructions to add a secret key and your MySQL credentials.
4. Create the databases, either through the SQL script or with Python. Running create_db.py will create them if they don't exist or print if they do.
```
python create_db.py
```
4. Create the tables if do not already exist - either through the SQL script or with Python (create_tables.py)
5. Create tables of the development database through the SQL script or running create_tables.py (recommended). Can use flask migrate, flask db upgrade, to get the latest migrations of tables. Alternatively you can also uncomment with app context db.create_all in the app.py factory function.
```
python create_tables.py
```
5. Run routes.py to start the server
```
python routes.py
flask db upgrade
```
6. Insert the book, game, and anime data from the SQL script file into your database so that can use the recommendation feature.
7. Run app.py to start the server
```
python app.py
```
Enjoy!
Binary file removed express-server/Images/ACOTAR.jpg
Binary file not shown.
Binary file removed express-server/Images/AttackOnTitan.jpg
Binary file not shown.
Binary file removed express-server/Images/Berserk.jpg
Binary file not shown.
Binary file removed express-server/Images/BlackClover.jpg
Binary file not shown.
Binary file removed express-server/Images/Bleach.jpg
Binary file not shown.
Binary file removed express-server/Images/ChainsawMan.jpg
Binary file not shown.
Binary file removed express-server/Images/CozyGrove.jpg
Binary file not shown.
Binary file removed express-server/Images/DeathNote.jpg
Binary file not shown.
Binary file removed express-server/Images/Dracula.jpg
Binary file not shown.
Binary file removed express-server/Images/DungeonMaster.jpg
Binary file not shown.
Binary file removed express-server/Images/ElizabethBathory.jpg
Binary file not shown.
Binary file removed express-server/Images/FaeFarm.jpg
Binary file not shown.
Binary file removed express-server/Images/FourthWing.jpg
Binary file not shown.
Binary file removed express-server/Images/GameDevTycoon.jpg
Binary file not shown.
Binary file removed express-server/Images/GodOfWar.jpg
Binary file not shown.
Binary file removed express-server/Images/HarryPotter.jpg
Binary file not shown.
Binary file removed express-server/Images/HogwartsLegacy.jpg
Binary file not shown.
Binary file removed express-server/Images/JJK.jpg
Binary file not shown.
Binary file removed express-server/Images/Jojo.jpg
Binary file not shown.
Binary file removed express-server/Images/Landlines.jpg
Binary file not shown.
Binary file removed express-server/Images/LiesOfP.jpg
Binary file not shown.
Binary file removed express-server/Images/LinkClick.jpg
Binary file not shown.
Binary file removed express-server/Images/LittleWitch.jpg
Binary file not shown.
Binary file removed express-server/Images/Naruto.jpg
Binary file not shown.
Binary file removed express-server/Images/OnePiece.jpg
Binary file not shown.
Binary file removed express-server/Images/SpellcasterUniversity.jpg
Diff not rendered.
Binary file removed express-server/Images/Spiderman2.jpg
Diff not rendered.
Binary file removed express-server/Images/StardewValley.jpg
Diff not rendered.
Binary file removed express-server/Images/TheExorcist.jpg
Diff not rendered.
Binary file removed express-server/Images/TheGreatEmpires.jpg
Diff not rendered.
Binary file removed express-server/Images/TheHaunting.jpg
Diff not rendered.
Binary file removed express-server/Images/TheShining.jpg
Diff not rendered.
Binary file removed express-server/Images/ToKillAKingdom.jpg
Diff not rendered.
Binary file removed express-server/Images/TokyoGhoul.jpg
Diff not rendered.
Binary file removed express-server/Images/TwoPointHospital.jpg
Diff not rendered.
Binary file removed express-server/Images/Unbroken.jpg
Diff not rendered.
86 changes: 0 additions & 86 deletions express-server/anime.json

This file was deleted.

23 changes: 0 additions & 23 deletions express-server/animeRoutes.js

This file was deleted.

23 changes: 0 additions & 23 deletions express-server/bookRoutes.js

This file was deleted.

98 changes: 0 additions & 98 deletions express-server/books.json

This file was deleted.

11 changes: 0 additions & 11 deletions express-server/config.js

This file was deleted.

Loading