Commit Graph

66 Commits

Author SHA1 Message Date
Chris-1010
5c16092b1c - Refactor of StreamsContext:
Added `featuredCategories` section,
Added personalised variations of HomePage contents;
- Removal of redundant/unused files from backend;
- Update to README: Updated to current method for deploying;
- Known bug: StreamsContext is being called before AuthContext, leading to unpersonalised streams & categories each time, even when logged in;
2025-01-24 17:24:10 +00:00
white
b9e912af1d Removed forms.py as validation is done in react now 2025-01-24 17:10:41 +00:00
white
ae9cd96333 Improved chat.py and created a temporary chat.html to be transferred to react later 2025-01-24 17:02:56 +00:00
Chris-1010
8ec60b1c41 Major: Added Authentication Functionality, interfaces with backend;
Added new styles to HomePage & VideoPage;
Added AuthContext to persist logged_in status;
2025-01-24 15:44:27 +00:00
JustIceO7
ca2a7e9baf created code for user routes and linked olds routes to reflect new ones 2025-01-24 05:11:03 +00:00
Oscar
52f977e885 final clean-up for database 2025-01-24 01:50:10 +00:00
Oscar
53bb478ab7 resolved merge conflict 2025-01-24 00:16:00 +00:00
Oscar
fe36f89426 Merge branch 'main' of https://github.com/john-david3/cs3305-team11 2025-01-24 00:10:39 +00:00
Oscar Cao
be2248fcad restrucuted blueprint layouts and added more skeleton api routes to be used from the frontend 2025-01-23 23:49:08 +00:00
Oscar Cao
ced77e718a merged and resolved database conflicts 2025-01-23 23:47:54 +00:00
Oscar Cao
f2afe5be2a cleaned up flask apis adding skeleton code 2025-01-23 22:42:36 +00:00
Oscar Cao
f9636f8650 updated database creating more tables 2025-01-23 22:41:45 +00:00
white
ab10673a67 updated the methods in chat.py, still need to make it interact with frontend 2025-01-23 20:51:09 +00:00
Chris-1010
667088ec9e Fix: Checkout
Fix: Formatting
2025-01-23 14:50:45 +00:00
white
33111ea077 Created new chat table in scheme.sql, Added chat.py with 3 methods (incomplete) 2025-01-23 13:10:22 +00:00
233e2df781 Fixed Flask fetching issue 2025-01-23 13:02:04 +00:00
1047b96c0f Fixed allowed hosts issue 2025-01-23 12:27:03 +00:00
b377240753 React runs on port 8080 2025-01-23 12:22:47 +00:00
Chris-1010
66957efe6f Update to structure 2025-01-23 12:13:50 +00:00
Chris-1010
be30d9c924 Update .gitignore;
Update to style of CheckoutForm
2025-01-23 12:03:41 +00:00
e7822f3c98 React runs on docker now 2025-01-23 11:41:53 +00:00
c0674c58b4 Moved frontend out of webserver into it's own container 2025-01-23 11:28:53 +00:00
e826311c34 Reimported render_template in main, for development purposes for now, and fixed /api endpoint not working 2025-01-23 10:32:18 +00:00
3c61d6f888 Updated gitignore to include env files 2025-01-23 10:31:47 +00:00
Christopher Ahern
e2b215015a Update README.md
Updated the README file to reflect the current project status and chosen technologies.
2025-01-22 23:59:37 +00:00
Chris-1010
7b2caae7d1 Removal of cache files 2025-01-22 23:46:09 +00:00
Chris-1010
92fdf3f3f3 Implemented Stripe Embedded Checkout Component;
Inclusion of .env files;
2025-01-22 22:54:18 +00:00
a36c745a4f Added temporary route and template to demonstrate the display of video streams 2025-01-22 15:28:21 +00:00
9847cf4007 Removed static folder location 2025-01-22 15:26:55 +00:00
52ac0c2aac Adjusted HLS root location, reduced latency and changed Flask access to have an /api/ prefix 2025-01-22 15:26:16 +00:00
38003695f7 Removed exposed Flask port 2025-01-22 14:03:36 +00:00
0f727f8c0d Adjusted proxy location settings 2025-01-22 14:00:17 +00:00
716637138a Fixed incorrect location in run command 2025-01-22 14:00:06 +00:00
Christopher Ahern
c116d30d34 Merge pull request #2 from Chris-1010/main
Update to Styling & Main Frontend
2025-01-22 13:50:58 +00:00
Christopher Ahern
1928866e24 Merge branch 'john-david3:main' into main 2025-01-22 13:50:03 +00:00
Chris-1010
fbe7d2ceb1 Updated Homepage & Styling;
Corrected imports/config settings;
2025-01-22 13:46:04 +00:00
ece474cbed Merge branch 'main' of https://github.com/john-david3/cs3305-team11 2025-01-22 13:30:08 +00:00
Christopher Ahern
cd594b5c2c Merge pull request #1 from Chris-1010/main
Reorganisation of project structure into backend/frontend sections; Introduced frontend integration; Connected backend to frontend.
2025-01-22 13:28:29 +00:00
178e9597d2 Fixed incorrect name 2025-01-22 01:16:39 +00:00
ca33ca6b70 Flask now runs on Gunicorn, and runs through NGinx 2025-01-22 00:55:18 +00:00
Chris-1010
1ede987914 Fix: Imports on backend
Fix: Connected Backend to Frontend over localhost
2025-01-21 23:54:11 +00:00
Christopher Ahern
2cda918e72 Merge branch 'john-david3:main' into main 2025-01-21 17:21:11 +00:00
Chris-1010
2887409ae6 Major: Restructure of Project
Major: Introduction of Frontend (React)
2025-01-21 17:19:23 +00:00
043effb6db Reorganised the webservers (temp for now) and docker-compose.yml now works 2025-01-21 00:29:07 +00:00
76991f0b39 Added Docker files, and removed RTMP server additions, added NGinx files (didn't added source NGinx files, docker will add them) 2025-01-20 00:14:13 +00:00
Oscar Cao
b8624c94a1 added beginnings of stripe payment for subscriptions 2025-01-19 21:20:12 +00:00
Oscar Cao
c0afafd07b added requirements.txt 2025-01-19 21:17:45 +00:00
white
d3620cc9da Added Flask Blueprints to enforce modularity 2025-01-19 20:13:45 +00:00
evan
43d97f638b Add: React Added For Future Frontend Developement 2025-01-18 23:34:07 +00:00
white
e89e5f0fef Improved login funtion by creating temporary HTML pages and fixing bugs in login 2025-01-17 16:58:23 +00:00