Skip to content

VideoTraining bug-fix #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
milanmitreski wants to merge 119 commits into from
Closed

VideoTraining bug-fix #131

Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
9122185
Add GitHub Action to prevent .env files in PRs to the main branch
sntntn Oct 1, 2025
c8f0c4f
Basic skeleton for Reservation Service. Relates to #74.
milanmitreski Feb 17, 2025
677488d
Reservation Controller and Repository methods changed and implemented…
milanmitreski Feb 17, 2025
0a41dec
NotificationEvent implemented. NotificationService added to docker-co…
milanmitreski Feb 18, 2025
bbafc3c
Notification publishing finished. Relates to #76.
milanmitreski Feb 19, 2025
7a1c84c
Extraction of Reservation logic from Client Service and Trainer Servi…
mmitreski Sep 27, 2025
f650419
Minor fix - removal of IPublishEndpoint fields in Client and Trainer …
mmitreski Sep 27, 2025
50754de
Group Training Reservationy - client view
sntntn Sep 28, 2025
5a56a4b
Individual Training Reservation - client view
sntntn Sep 28, 2025
74974b2
updated sidebar icons for group/individual training
sntntn Sep 28, 2025
67c530d
Group Trainings Setup - trainer view
sntntn Sep 28, 2025
ba4007b
Add reservation API endpoints - Front
sntntn Sep 28, 2025
ac4c4b7
Remove Authorization for Reservation Service + add some comments on
sntntn Sep 28, 2025
dc87fb0
frontend - implement notifications dropdown
sntntn Sep 28, 2025
a69b828
Notification Service API integration in Front + Dropdown list
sntntn Sep 28, 2025
ccb0dec
Added notification detail popup on dropdown click
sntntn Sep 28, 2025
2e3355c
Bug fix - Reservation Service not starting. Relates to #97
mmitreski Sep 28, 2025
309d324
Minor fix -- addition of TrainingType information to entity classes. …
mmitreski Sep 28, 2025
c8ca8d2
minor fix
sntntn Sep 28, 2025
2f96398
ReservationService class added. Funcionalities extracted from Control…
mmitreski Sep 29, 2025
5a1da11
Redundant queue constants and classes deleted. Relates to #100.
mmitreski Sep 28, 2025
ab7ba2f
Notification refactoring. Relates to #99.
mmitreski Sep 28, 2025
1cba885
Notification refactoring finished. Relates to #99.
mmitreski Sep 28, 2025
2007b42
front - correct fields mapping and modal details in notification
sntntn Sep 28, 2025
c89968a
Implement support for marking notifications as read (backend + frontend)
sntntn Sep 29, 2025
a12c23c
Migration added. Relates to #100.
mmitreski Sep 29, 2025
c037311
Frontend and Backend for ReservationService additionaly implemented. …
mmitreski Sep 29, 2025
4d87922
Improve client individual training frontend. Enable booking from the …
stemil01 Sep 30, 2025
bd09de4
Finish the first version of client individual reservation frontend pa…
stemil01 Sep 30, 2025
6407bf2
Complete client and trainer ground trainings frontend pages. Relates …
stemil01 Oct 4, 2025
4afa005
Finish the frontend for reservations service. Relates to #103 and #104.
stemil01 Oct 5, 2025
963922c
PaymentService integrated with ReservationService and ChatService. Mi…
milanmitreski Oct 7, 2025
46020f9
Add basic structure for analytics service
stemil01 Dec 9, 2024
dbbeb41
Add create new training
stemil01 Jan 4, 2025
e05751a
Add comment field in Training
stemil01 Jan 12, 2025
cd0390d
Add some statistics methods in Analytics.API
stemil01 Jan 12, 2025
9427c51
Add grpc client. Related to #40
stemil01 Jan 20, 2025
27c7461
Add training held event for consumer side in Analytics service. Relat…
stemil01 Jan 26, 2025
0a36703
Resolve docker-compose image mongodb conflict
stemil01 Feb 8, 2025
3252a3f
Add client analytics page. Relates to #69
stemil01 Feb 18, 2025
e0b7885
Add template for trainer analytics page. Relates to #69.
stemil01 Feb 18, 2025
02c1fd3
Resolve navigation bug in client analytics page. Relates to #69.
stemil01 Feb 18, 2025
83f2fbf
Nothing. Relates to #69.
stemil01 Feb 18, 2025
8f2dd77
Create new file for Analytics data. Relates to #69.
stemil01 Feb 18, 2025
daee9fa
Add CORS in analytics service and first non-hardcoded data. Relates t…
stemil01 Feb 18, 2025
12fc961
Add delete API call
stemil01 Feb 21, 2025
a130479
Create new API with appropriate object type along with the necessary …
stemil01 Feb 21, 2025
5470a36
Complete the first version of client's page in the frontend. Relates …
stemil01 Feb 21, 2025
45220e1
Rebasing analytics service on dev. Fixes.
milanmitreski Oct 8, 2025
f586c3f
Event modelling for Reservation/Review updates to Analytics Service f…
milanmitreski Oct 8, 2025
db0685d
Review and Reservation Services refactored. Review frontend updated. …
milanmitreski Oct 11, 2025
7db841b
Correct the GRPC settings string.
stemil01 Oct 11, 2025
b537d26
Minor email notification fix.
milanmitreski Oct 11, 2025
bf8b7eb
Create the frontend template for trainer and client analytics. Relate…
stemil01 Sep 29, 2025
23bd3f6
Create consumer part for reservations on analytics service and refact…
stemil01 Oct 12, 2025
32d6d5d
Configure anlytics service consumer part for reviews. Relates to #114.
stemil01 Oct 12, 2025
9c34a29
Add ClilentId and TrainerId for submitting reviews. Relates to #114.
stemil01 Oct 12, 2025
da6e62a
Minor review fix.
milanmitreski Oct 12, 2025
29f56ce
ChatService migration
sntntn Oct 12, 2025
7cc8123
[videoTraining] feat: training generator with exercise videos
NataMata Dec 5, 2024
13cc97b
Add: gitignore file changed
NataMata Dec 6, 2024
b89486a
Feat: added data models
NataMata Dec 12, 2024
1bf5f14
Fix: field order changed
NataMata Dec 12, 2024
c68665f
Feat: added context class and required settings
NataMata Dec 12, 2024
2b9dc5e
Fix: changed files structure
NataMata Dec 14, 2024
4d58247
New: added necessary classes and references for data access
NataMata Dec 14, 2024
e1e75bf
Fix: deleted generic code and modified to enable the project to work
NataMata Dec 14, 2024
bfe37d2
New: added controller file and one basic request for testing
NataMata Dec 14, 2024
07ddf4e
Fix: changed structure for training exercise
NataMata Dec 15, 2024
f08215f
Feat: implemented all required methods in controller
NataMata Dec 15, 2024
2a81ca9
Fix: fixed response types
NataMata Dec 15, 2024
c23e9b4
Add: added necessary middleware.
NataMata Jan 12, 2025
f17bd72
Refactor: refactoring HTTP request attributes.
NataMata Jan 12, 2025
303a215
Fix: changed attributes due to routing error.
NataMata Jan 16, 2025
10073c9
New: service containerization.
NataMata Jan 20, 2025
9d698a6
New: added navigation to blank pages for video training service for b…
NataMata Jan 30, 2025
f7ddd0f
Fix: name refactoring.
NataMata Feb 4, 2025
73b19b4
Test: checkout test.
NataMata Feb 4, 2025
e9bf1d9
New: client frontend first page
NataMata Feb 4, 2025
d8599ec
Fix: typo changes.
NataMata Feb 4, 2025
455ba2e
Delete: .idea file removed. #16
NataMata Feb 4, 2025
e2065e4
Change: changed icon for video training service.
NataMata Feb 22, 2025
d1ab377
Refactor: separated client and trainer pages.
NataMata Feb 22, 2025
75770f3
Necessary backend changes to enable exercise add and show functionality.
NataMata Oct 1, 2025
28301a9
Add: frontend for exercise add and show functionality.
NataMata Oct 1, 2025
d76bdff
Added back and frontend for training functionalities.
NataMata Oct 5, 2025
c06cfea
Fix: frontend for both client and trainer.
NataMata Oct 6, 2025
f4c84e6
Fix: fixed style for client side.
NataMata Oct 8, 2025
4e7578e
Add: added backend functionalities.
NataMata Oct 12, 2025
c3d512f
Rebased videoTrainingService on analyticsService. Payment integrated …
milanmitreski Oct 12, 2025
4e5afd7
Init NutritionService
anjaanjaa10 Sep 28, 2025
6cdb638
Added Food and Goals API with Mongo integration and calorie calculation
anjaanjaa10 Sep 28, 2025
d4299be
Added Nutrition Plan sidebar items and created routes in frontend Clo…
anjaanjaa10 Oct 1, 2025
595046f
Added NutritionService with calorie and BMI calculation + frontend in…
anjaanjaa10 Oct 7, 2025
53b264f
Implemented Food and MealPlan endpoints for NutritionService (refs #107)
anjaanjaa10 Oct 7, 2025
eaa24e1
Redesigned and added nutrition plan management, added frontend for tr…
anjaanjaa10 Oct 12, 2025
29be08d
Added multiplans selection by trainers per client
anjaanjaa10 Oct 12, 2025
b1a928e
Rebased nutritionService on dev. Minor fix.
milanmitreski Oct 12, 2025
379852c
Correct the GRPC string for trainerservice.api.
stemil01 Oct 13, 2025
caf081a
Navigation bug fixed and refactored
anjaanjaa10 Oct 12, 2025
81bf6ae
refactored by moving axios logic to js for client and trainer
anjaanjaa10 Oct 13, 2025
0c9c464
bug fix
anjaanjaa10 Oct 13, 2025
7135324
Add: added new feature for client view of exercise.
NataMata Oct 13, 2025
ed18d6f
Connect the client-side analytics frontend with backend. Relates to #84.
stemil01 Oct 13, 2025
e6c37ad
Connect the trainer-side analytics frontend with backend. Relates to …
stemil01 Oct 13, 2025
f17571c
Remove GRPC sevise from Analytics service since it is not used anywhere.
stemil01 Oct 13, 2025
a198b94
Remove unnecessary mapper in AnalyticsController.
stemil01 Oct 13, 2025
4608d78
Refactor review service to support group reviews submission via front…
stemil01 Oct 13, 2025
f2a1fbc
refactored by moving axios logic to js for client and trainer
anjaanjaa10 Oct 13, 2025
94696f7
Added food addition on trainer side
anjaanjaa10 Oct 14, 2025
ad673fd
Authentication and authorization enabled on all microservices. Relate…
milanmitreski Oct 13, 2025
8cdbe5a
Nutrition Service authorization roles changed. Relates to #119.
milanmitreski Oct 13, 2025
f099501
VideoTrainingService authorization roles changed. Relates to #119.
milanmitreski Oct 13, 2025
0842c00
AnalyticsService integrated in authorization. Relates to #119.
milanmitreski Oct 14, 2025
65324fb
Compose files cleaned-up. Gateway/Discovery integrated into Analytics…
milanmitreski Oct 13, 2025
42bf429
Frontend integrated with Gateway. Relates to #120.
milanmitreski Oct 13, 2025
e4e79ee
BugFix: Connect addFood API call to Gateway. Main branch merged.
milanmitreski Oct 14, 2025
17b3b3d
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
milanmitreski Oct 15, 2025
f225fc7
BugFix: Fix deleteTraining function in VideoTrainingTrainer.vue.
milanmitreski Oct 15, 2025
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
3 changes: 2 additions & 1 deletion Fitness/Frontend/src/views/pages/VideoTrainingsTrainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,8 @@ export default {
}

alert('Obrisali ste trening!');
this.exercises = this.trainingExercises.filter(tr => tr.Id !== trainingId);
this.trainingExercises = this.trainingExercises.filter(tr => tr.Id !== trainingId);
this.loadTrainings();
},

getExerciseName(id) {
Expand Down