Commit Graph

54 Commits

Author SHA1 Message Date
gzub04
6cb0cfbe92 Remove "analitics" 2024-06-16 23:48:46 +02:00
gzub04
b67849d045 Merge branch 'refs/heads/get_movie_recommendations' 2024-06-16 23:42:49 +02:00
gzub04
e784c47f4c Fixed analytics.py and added new test 2024-06-16 23:40:07 +02:00
gzub04
2f117ea384 Added tests, fixed some frontend_AI_connector.py, analytics.py kinda done 2024-06-16 23:33:44 +02:00
gzub04
f20e6e483a Merge branch 'refs/heads/dev_Alkaratus' into get_movie_recommendations
# Conflicts:
#	connector/Include/frontend_AI_connector.py
#	movie_recommendations/Test.http
#	movie_recommendations/movie_recommender.py
2024-06-16 22:49:48 +02:00
gzub04
c6322cb4be AI API fully working 2024-06-16 22:33:16 +02:00
gzub04
56ad8d937a Rebase 2024-06-16 21:38:20 +02:00
gzub04
aca55b420d Rebase 2024-06-16 21:38:00 +02:00
gzub04
b133fa1b07 Naprawiony stuff Alkaratusa, przerobione na flask, małe poprawki 2024-06-16 21:27:17 +02:00
Hubert Dwornik
2b9d3e6b33 Merge branch 'main' of https://github.com/gzub04/ERSMS-project 2024-06-16 21:22:01 +02:00
Hubert Dwornik
0ef1edeb9e minor fix 2024-06-16 21:21:54 +02:00
gzub04
fb86be5af8 Basic poprawki 2024-06-16 21:10:27 +02:00
Alkaratus
782f1c806b Klasy+funkcje do uzupełnienia kwerendami 2024-06-16 21:10:26 +02:00
d3011f76d2 feat: merged 2024-06-16 20:58:45 +02:00
d7d3b76b83 feat: merge msar branch 2024-06-16 20:56:06 +02:00
82d8406271 Merge remote-tracking branch 'origin/dev_msar' 2024-06-16 20:54:39 +02:00
b462f9db36 Merge branch 'main' of https://github.com/kuhyx/ERSMS-project 2024-06-16 20:52:24 +02:00
Hubert Dwornik
8e6bcba337 frontend do dockera 2024-06-16 20:52:10 +02:00
21742473d8 Merge remote-tracking branch 'origin/dev_Alkaratus' 2024-06-16 20:52:09 +02:00
gzub04
1370cde9a0 Dodanie https 2024-06-16 18:40:51 +02:00
gzub04
a1f48c2c4f Cachowanie works dla AI 2024-06-16 18:04:50 +02:00
Alkaratus
b45dd67005 Klasy+funkcje do uzupełnienia kwerendami 2024-06-15 19:47:16 +02:00
gzub04
efdad74b3d Dodanie API do rekomendacji 2024-06-15 18:29:19 +02:00
Hubert Dwornik
f702d18251 zabawy z cache 2024-06-14 18:12:53 +02:00
Michał Sar
a8db79ba06 minor fixes 2024-05-28 21:45:04 +02:00
52e509404e Merge branch 'main' into frontend_AI_communication 2024-05-28 05:06:53 +02:00
62a72995e6 feat: merged with main 2024-05-28 05:05:00 +02:00
c18cdacb1a feat: merged with main 2024-05-28 04:55:30 +02:00
Hubert Dwornik
8e095a47ec oceny i update instrukcji 2024-05-14 15:53:30 +02:00
Hubert Dwornik
2071bd7a5a changed instructions 2024-05-13 11:38:05 +02:00
Hubert Dwornik
8f4b8a5494 backend container works 2024-05-12 19:14:07 +02:00
Hubert Dwornik
ff722f72bf jeszcze niedziałająca konteneryzacja dockera 2024-05-12 17:13:15 +02:00
Michał Sar
6c0d666085 move initial frontend to repo 2024-05-12 15:30:17 +02:00
gzub04
7d913ab560 Rename z main.py do movie_recommender.py 2024-05-12 15:26:51 +02:00
gzub04
969a013909 Działa dla wielu filmów, patrzy po ID filmów z TBDM 2024-05-12 15:24:09 +02:00
Hubert Dwornik
9808014e53 little cleanup + endpoint for sending info about movies 2024-05-12 14:39:49 +02:00
gzub04
3f22570c4e Refactored do klasy 2024-05-12 14:17:51 +02:00
1adf3ef501 Revert "feat: make website actually display something"
This reverts commit e35b578120.
2024-05-12 14:15:53 +02:00
e35b578120 feat: make website actually display something 2024-05-12 13:24:24 +02:00
34ae98a912 Revert "feat: make http-server listen on all network interfaces"
This reverts commit 35bafc1814.
2024-05-12 13:03:08 +02:00
35bafc1814 feat: make http-server listen on all network interfaces 2024-05-12 12:59:33 +02:00
4abfd73e9d feat: added http srever to dockerfile 2024-05-12 12:46:37 +02:00
Hubert Dwornik
903a4ccf05 postgres baza 2024-05-12 12:10:38 +02:00
Hubert Dwornik
a7812d4037 opisanie rzeczy i wgl 2024-05-11 16:30:59 +02:00
dff7cc6474 feat: exposed port 8080 dockerfile 2024-05-11 16:14:22 +02:00
a0bfb28c3e feat: simplest 8080 dockerfile 2024-05-11 16:10:37 +02:00
cb9601ddb7 feat: added hello world dockerfile 2024-05-11 16:07:43 +02:00
gzub04
6302bf37c2 Podstawowa wersja AI do rekomendacji
Aktualnie tylko na podstawie jednego filmu, wszystko wwalone do maina
2024-05-11 15:58:04 +02:00
7158d99990 feat: analytics service requirements 2024-05-11 15:05:30 +02:00
1f732cfed0 feat: requiremnets for deployment and monitoring 2024-05-11 14:25:57 +02:00