# # ChangeLog for / # # Generated by Trac 1.6 # 09/20/25 08:05:11 Wed, 03 Sep 2025 20:43:43 GMT anagjurchinova [79f8495] * src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java (modified) * src/main/resources/templates/medicine-interactions.html (modified) Fixed bugs in medicine interactions Wed, 03 Sep 2025 13:22:39 GMT GitHub [32d6a94] * src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/models/User.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/UserService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/RegisterController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/register-success.html (added) * src/main/resources/templates/register.html (added) Merge pull request #10 from NorksX/feature/registration Implemented ... Wed, 03 Sep 2025 12:57:07 GMT anagjurchinova [f18f0d5] * src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/models/User.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/UserService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/RegisterController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/register-success.html (added) * src/main/resources/templates/register.html (added) Implemented registration for clients Wed, 03 Sep 2025 04:16:48 GMT GitHub [cba2493] * src/main/java/mk/ukim/finki/synergymed/models/Supplyorder.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/DistributorBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacistRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/SupplyorderBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ClubCardService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/SupplyOrderService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClubCardServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/SupplyOrderServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/VerificationReviewServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ClientOrderController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/FacilityController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/HomeController.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/SupplyOrderController.java (added) * src/main/resources/templates/add-medicine-interaction.html (modified) * src/main/resources/templates/branded-medicine-form.html (modified) * src/main/resources/templates/cart.html (modified) * src/main/resources/templates/catalog-edit.html (modified) * src/main/resources/templates/catalog.html (modified) * src/main/resources/templates/companies.html (modified) * src/main/resources/templates/company-form.html (modified) * src/main/resources/templates/create-health-profile.html (modified) * src/main/resources/templates/facilities.html (modified) * src/main/resources/templates/facility-contacts.html (modified) * src/main/resources/templates/facility-form.html (modified) * src/main/resources/templates/facility-inventory.html (modified) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/login.html (modified) * src/main/resources/templates/manage-allergies.html (modified) * src/main/resources/templates/medicine-interactions.html (modified) * src/main/resources/templates/order-detail.html (modified) * src/main/resources/templates/orders.html (modified) * src/main/resources/templates/payment-success.html (modified) * src/main/resources/templates/payment.html (modified) * src/main/resources/templates/profile-clubcard.html (modified) * src/main/resources/templates/profile-contacts.html (modified) * src/main/resources/templates/profile-prescriptions.html (modified) * src/main/resources/templates/profile.html (modified) * src/main/resources/templates/supplyorder-details.html (added) * src/main/resources/templates/supplyorder-list.html (added) * src/main/resources/templates/supplyorder.html (added) * src/main/resources/templates/verification-apply.html (modified) * src/main/resources/templates/verification-approval.html (modified) * src/main/resources/templates/verification-list.html (modified) * uploads/images/portraits/portrait_2_a6d8ea7a-c255-4fa6-b514-9dd759057b0e.png (deleted) Merge pull request #9 from NorksX/shoppingcart Translated html ... Wed, 03 Sep 2025 04:15:34 GMT NorksX [dd0877c] * src/main/java/mk/ukim/finki/synergymed/models/Supplyorder.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/DistributorBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacistRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/SupplyorderBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ClubCardService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/SupplyOrderService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClubCardServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/SupplyOrderServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/VerificationReviewServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ClientOrderController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/FacilityController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/HomeController.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/SupplyOrderController.java (added) * src/main/resources/templates/add-medicine-interaction.html (modified) * src/main/resources/templates/branded-medicine-form.html (modified) * src/main/resources/templates/cart.html (modified) * src/main/resources/templates/catalog-edit.html (modified) * src/main/resources/templates/catalog.html (modified) * src/main/resources/templates/companies.html (modified) * src/main/resources/templates/company-form.html (modified) * src/main/resources/templates/create-health-profile.html (modified) * src/main/resources/templates/facilities.html (modified) * src/main/resources/templates/facility-contacts.html (modified) * src/main/resources/templates/facility-form.html (modified) * src/main/resources/templates/facility-inventory.html (modified) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/login.html (modified) * src/main/resources/templates/manage-allergies.html (modified) * src/main/resources/templates/medicine-interactions.html (modified) * src/main/resources/templates/order-detail.html (modified) * src/main/resources/templates/orders.html (modified) * src/main/resources/templates/payment-success.html (modified) * src/main/resources/templates/payment.html (modified) * src/main/resources/templates/profile-clubcard.html (modified) * src/main/resources/templates/profile-contacts.html (modified) * src/main/resources/templates/profile-prescriptions.html (modified) * src/main/resources/templates/profile.html (modified) * src/main/resources/templates/supplyorder-details.html (added) * src/main/resources/templates/supplyorder-list.html (added) * src/main/resources/templates/supplyorder.html (added) * src/main/resources/templates/verification-apply.html (modified) * src/main/resources/templates/verification-approval.html (modified) * src/main/resources/templates/verification-list.html (modified) * uploads/images/portraits/portrait_2_a6d8ea7a-c255-4fa6-b514-9dd759057b0e.png (deleted) Translated html (need to review tomorrow), added supply order logic. ... Tue, 02 Sep 2025 23:21:12 GMT GitHub [aa29b78] * src/main/java/mk/ukim/finki/synergymed/config/RoleResolver.java (added) * src/main/java/mk/ukim/finki/synergymed/models/PharmacyCatalogId.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/AdminRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/InventoryBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacistRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacyCatalogRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/CatalogService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/PaymentService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ShoppingCartService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/BrandedMedicineServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/CatalogServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/FacilityServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/InventoryServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PrescriptionServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/VerificationReviewServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/VerificationController.java (modified) * src/main/resources/application.properties (modified) * src/main/resources/templates/branded-medicine-form.html (modified) * src/main/resources/templates/cart.html (modified) * src/main/resources/templates/catalog-edit.html (added) * src/main/resources/templates/catalog.html (added) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/payment.html (modified) * src/main/resources/templates/profile-clubcard.html (added) * src/main/resources/templates/profile-contacts.html (modified) * src/main/resources/templates/profile-prescriptions.html (modified) * src/main/resources/templates/profile.html (modified) Merge pull request #8 from NorksX/shoppingcart Shoppingcart Tue, 02 Sep 2025 23:20:52 GMT NorksX [4a13d36] * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) Fixes Tue, 02 Sep 2025 23:19:18 GMT NorksX [1e83903] * src/main/java/mk/ukim/finki/synergymed/config/ConfigProbe.java (deleted) * src/main/java/mk/ukim/finki/synergymed/config/OpenApiConfig.java (deleted) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (deleted) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (deleted) * src/main/java/mk/ukim/finki/synergymed/service/jwt/TokenBlacklistService.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/AllergyController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ClientOrderController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/HealthProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/LogoutController.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/SensitiveClientDataController.java (modified) * src/main/resources/application.properties (modified) Merge remote-tracking branch 'origin/main' # Conflicts: # ... Tue, 02 Sep 2025 23:05:13 GMT NorksX [ac37cef] * src/main/java/mk/ukim/finki/synergymed/config/RoleResolver.java (added) * src/main/java/mk/ukim/finki/synergymed/models/PharmacyCatalogId.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/AdminRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/InventoryBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacistRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacyCatalogRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/CatalogService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/PaymentService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ShoppingCartService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/BrandedMedicineServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/CatalogServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/FacilityServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/InventoryServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PrescriptionServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/VerificationReviewServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/CatalogController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/VerificationController.java (modified) * src/main/resources/application.properties (modified) * src/main/resources/templates/branded-medicine-form.html (modified) * src/main/resources/templates/cart.html (modified) * src/main/resources/templates/catalog-edit.html (added) * src/main/resources/templates/catalog.html (added) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/payment.html (modified) * src/main/resources/templates/profile-clubcard.html (added) * src/main/resources/templates/profile-contacts.html (modified) * src/main/resources/templates/profile-prescriptions.html (modified) * src/main/resources/templates/profile.html (modified) shopping cart club card implementation Tue, 02 Sep 2025 23:04:12 GMT GitHub [718f543] * src/main/java/mk/ukim/finki/synergymed/config/ConfigProbe.java (deleted) * src/main/java/mk/ukim/finki/synergymed/config/OpenApiConfig.java (deleted) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (deleted) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (deleted) * src/main/java/mk/ukim/finki/synergymed/service/jwt/TokenBlacklistService.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/AllergyController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ClientOrderController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/HealthProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/LogoutController.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/SensitiveClientDataController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) * src/main/resources/application.properties (modified) Merge pull request #7 from NorksX/feature/security switched to ... Tue, 02 Sep 2025 18:11:34 GMT anagjurchinova [e944b43] * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/AllergyController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ClientOrderController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/HealthProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/SensitiveClientDataController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (modified) Controllers fix after jsession security Tue, 02 Sep 2025 14:45:55 GMT anagjurchinova [5e1075d] * src/main/java/mk/ukim/finki/synergymed/config/ConfigProbe.java (deleted) * src/main/java/mk/ukim/finki/synergymed/config/OpenApiConfig.java (deleted) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (deleted) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (deleted) * src/main/java/mk/ukim/finki/synergymed/service/jwt/TokenBlacklistService.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/LogoutController.java (deleted) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/resources/application.properties (modified) switched to jsession security Sun, 31 Aug 2025 23:58:47 GMT GitHub [a2fc3d8] * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/resources/application.properties (modified) * src/main/resources/templates/manage-allergies.html (modified) Merge pull request #6 from NorksX/feature/payment-service Fixed bugs Sun, 31 Aug 2025 13:17:36 GMT anagjurchinova [fe7e82f] * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/resources/application.properties (modified) * src/main/resources/templates/manage-allergies.html (modified) Fixed bugs Sun, 31 Aug 2025 01:24:51 GMT NorksX [8e5e404] * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientorderRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ContactinformationRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/FacilityRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/InventoryBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/InventoryRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/PrescriptionRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/SensitiveclientdataRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ClientOrderService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ClientService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ContactInformationService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/FacilityService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/InventoryService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/PrescriptionService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/SensitiveClientDataService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/VerificationReviewService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClientOrderServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClientServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/ContactInformationServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/FacilityServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/InventoryServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PrescriptionServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/SensitiveClientDataServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/VerificationReviewServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/ClientOrderController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/FacilityController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/GlobalModelAttributes.java (added) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/SensitiveClientDataController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/VerificationController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/companies.html (modified) * src/main/resources/templates/facilities.html (added) * src/main/resources/templates/facility-contacts.html (added) * src/main/resources/templates/facility-form.html (added) * src/main/resources/templates/facility-inventory.html (added) * src/main/resources/templates/fragments/header.html (modified) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/order-detail.html (added) * src/main/resources/templates/orders.html (added) * src/main/resources/templates/profile-contacts.html (added) * src/main/resources/templates/profile-prescriptions.html (added) * src/main/resources/templates/profile.html (modified) * src/main/resources/templates/verification-apply.html (added) * src/main/resources/templates/verification-approval.html (added) * src/main/resources/templates/verification-list.html (added) * uploads/images/branded_medicine/branded_medicine_15_1756422183031_001.webp (added) * uploads/images/branded_medicine/branded_medicine_15_1756422183031_002.png (added) * uploads/images/branded_medicine/branded_medicine_15_1756422197085_001.webp (added) * uploads/images/branded_medicine/branded_medicine_5_1756396799546_001.jpg (added) * uploads/images/portraits/portrait_2_a6d8ea7a-c255-4fa6-b514-9dd759057b0e.png (added) Prescription, verification added, shopping cart updated, controller ... Sat, 30 Aug 2025 17:53:58 GMT GitHub [8b8dd49] * src/main/java/mk/ukim/finki/synergymed/models/Clientorder.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/ClientorderBrandedmedicineId.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/PaymentMethodService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/PaymentService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ShoppingCartService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentMethodServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (added) * src/main/resources/templates/manage-allergies.html (modified) * src/main/resources/templates/payment-success.html (added) * src/main/resources/templates/payment.html (added) Merge pull request #5 from NorksX/feature/payment-service ... Sat, 30 Aug 2025 17:53:48 GMT GitHub [0b0cd4e] * src/main/java/mk/ukim/finki/synergymed/exceptions/NotEnoughMedicineInStockException.java (added) * src/main/java/mk/ukim/finki/synergymed/models/ShoppingcartBrandedmedicineId.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ShoppingcartBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ShoppingcartRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ShoppingCartService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/UserService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (added) * src/main/resources/templates/cart.html (added) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/login.html (modified) Merge pull request #4 from NorksX/feature/shopping-cart ... Sat, 30 Aug 2025 17:53:35 GMT GitHub [abb9ec8] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidInputException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/MedicineAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/MedicineInteractionAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineinteractionRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/MedicineServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/jwt/TokenBlacklistService.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LogoutController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/add-medicine-interaction.html (added) * src/main/resources/templates/companies.html (modified) * src/main/resources/templates/company-form.html (modified) * src/main/resources/templates/create-health-profile.html (modified) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/manage-allergies.html (modified) * src/main/resources/templates/medicine-interactions.html (added) * src/main/resources/templates/profile.html (modified) Merge pull request #3 from NorksX/feature/medicine-interactions ... Sat, 30 Aug 2025 15:54:02 GMT anagjurchinova [95f6078] * src/main/java/mk/ukim/finki/synergymed/models/Clientorder.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/ClientorderBrandedmedicineId.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/PaymentMethodService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/PaymentService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ShoppingCartService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentMethodServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/PaymentServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/PaymentController.java (added) * src/main/resources/templates/manage-allergies.html (modified) * src/main/resources/templates/payment-success.html (added) * src/main/resources/templates/payment.html (added) Implemented payment service Sat, 30 Aug 2025 11:37:26 GMT anagjurchinova [66bed65] * src/main/java/mk/ukim/finki/synergymed/exceptions/NotEnoughMedicineInStockException.java (added) * src/main/java/mk/ukim/finki/synergymed/models/ShoppingcartBrandedmedicineId.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ShoppingcartBrandedmedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ShoppingcartRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ShoppingCartService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/UserService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/ShoppingCartServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ShoppingCartController.java (added) * src/main/resources/templates/cart.html (added) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/login.html (modified) Implemented a shopping cart and its functionalities Sat, 30 Aug 2025 09:04:48 GMT anagjurchinova [a39e417] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/jwt/TokenBlacklistService.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LogoutController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/profile.html (modified) Added redis configuration for jwt Fri, 29 Aug 2025 22:20:58 GMT anagjurchinova [a6008b0] * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/MedicineServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java (modified) * src/main/resources/application.properties (modified) * src/main/resources/templates/add-medicine-interaction.html (modified) * src/main/resources/templates/companies.html (modified) * src/main/resources/templates/company-form.html (modified) * src/main/resources/templates/create-health-profile.html (modified) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/manage-allergies.html (modified) * src/main/resources/templates/medicine-interactions.html (modified) * src/main/resources/templates/profile.html (modified) Added medicine interactions + fixed bugs Fri, 29 Aug 2025 20:55:15 GMT anagjurchinova [7be83a2] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/config/StaticResourceConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Brandedmedicineimage.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Deliverycompany.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Distributor.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Manufacturer.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacy.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/enumerations/CompanyRoleType.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineimageRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/CompanyOrchestrationService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/CompanyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/DeliveryCompanyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/DistributorService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ManufacturerService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/PharmacyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/BrandedMedicineServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyOrchestrationServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/DeliveryCompanyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/DistributorServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ManufacturerServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/MedicineServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/PharmacyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/static/logo.png (added) * src/main/resources/templates/branded-medicine-form.html (added) * src/main/resources/templates/companies.html (added) * src/main/resources/templates/company-form.html (added) * src/main/resources/templates/fragments/header.html (added) * src/main/resources/templates/index.html (added) * src/main/resources/templates/profile.html (modified) Merge branch 'main' of https://github.com/NorksX/SynergyMed into ... Fri, 29 Aug 2025 20:51:57 GMT anagjurchinova [fa9c17a] * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidInputException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/MedicineAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/MedicineInteractionAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineinteractionRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/MedicineServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/MedicineInteractionController.java (added) * src/main/resources/templates/add-medicine-interaction.html (added) * src/main/resources/templates/medicine-interactions.html (added) Added medicine interactions Fri, 29 Aug 2025 14:28:16 GMT NorksX [5682fcc] * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (modified) * src/main/resources/static/logo.png (added) * src/main/resources/templates/branded-medicine-form.html (modified) * src/main/resources/templates/companies.html (modified) * src/main/resources/templates/fragments/header.html (added) * src/main/resources/templates/index.html (modified) * src/main/resources/templates/profile.html (modified) header WIP Fri, 29 Aug 2025 00:20:34 GMT NorksX [ed4e8e4] * src/main/java/mk/ukim/finki/synergymed/models/Healthprofile.java (modified) Merge branch 'feature/health-profile-impl' of ... Fri, 29 Aug 2025 00:20:13 GMT NorksX [e0f42d2] * src/main/java/mk/ukim/finki/synergymed/models/Deliverycompany.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/enumerations/CompanyRoleType.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/DeliveryCompanyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/DeliveryCompanyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/CompanyController.java (added) * src/main/resources/templates/companies.html (added) * src/main/resources/templates/company-form.html (added) Company controller and html added Thu, 28 Aug 2025 23:57:44 GMT anagjurchinova [1cdd6db] * src/main/java/mk/ukim/finki/synergymed/models/Healthprofile.java (modified) Added health profile management Thu, 28 Aug 2025 23:11:10 GMT GitHub [12ce021] * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/HealthProfileDoesNotExistException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidArgumentsException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidEmailFormatException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/MedicineDoesNotExistException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/UserNotFoundException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/models/AllergicreactionHealthprofileMedicine.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/AllergicreactionHealthprofileMedicineId.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClubcardRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/HealthprofileRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/UserRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ClientService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ClubCardService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/HealthProfileService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/UserService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClientServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClubCardServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/HealthProfileServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/AllergyController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/HealthProfileController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (added) * src/main/resources/templates/create-health-profile.html (added) * src/main/resources/templates/manage-allergies.html (added) * src/main/resources/templates/profile.html (added) Merge pull request #2 from NorksX/feature/health-profile-impl ... Thu, 28 Aug 2025 23:10:46 GMT GitHub [66ad712] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/SynergyMedApplication.java (modified) * src/main/java/mk/ukim/finki/synergymed/config/ConfigProbe.java (added) * src/main/java/mk/ukim/finki/synergymed/config/OpenApiConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidArgumentsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidEmailFormatException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Admin.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Client.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacist.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/User.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/UserRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/AppUserDetails.java (added) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (added) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (added) * src/main/java/mk/ukim/finki/synergymed/web/HomeController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/login.html (added) Merge pull request #1 from NorksX/feature/jwt-authentication Added ... Thu, 28 Aug 2025 23:10:36 GMT GitHub [6c7d594] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/config/StaticResourceConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Brandedmedicineimage.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Distributor.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Manufacturer.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacy.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/enumerations/CompanyRoleType.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineimageRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/CompanyOrchestrationService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/CompanyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/DistributorService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ManufacturerService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/PharmacyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/BrandedMedicineServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyOrchestrationServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/DistributorServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ManufacturerServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/MedicineServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/PharmacyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/branded-medicine-form.html (added) * src/main/resources/templates/index.html (added) Merge branch 'main' into feature/jwt-authentication Thu, 28 Aug 2025 23:06:03 GMT NorksX [30a24d5] * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/impl/BrandedMedicineServiceImpl.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (modified) * src/main/resources/templates/branded-medicine-form.html (modified) * src/main/resources/templates/index.html (modified) fixed home page Thu, 28 Aug 2025 22:34:27 GMT anagjurchinova [7f37d04] * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/HealthProfileDoesNotExistException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidArgumentsException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidEmailFormatException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/MedicineDoesNotExistException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/exceptions/UserNotFoundException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (deleted) * src/main/java/mk/ukim/finki/synergymed/models/AllergicreactionHealthprofileMedicine.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/AllergicreactionHealthprofileMedicineId.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/ClubcardRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/HealthprofileRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/UserRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/ClientService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ClubCardService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/HealthProfileService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/UserService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClientServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ClubCardServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/HealthProfileServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/UserServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/AllergyController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/HealthProfileController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/ProfileController.java (added) * src/main/resources/templates/create-health-profile.html (added) * src/main/resources/templates/manage-allergies.html (added) * src/main/resources/templates/profile.html (added) Added a user profile, health profile, admin panel + health profile ... Thu, 28 Aug 2025 17:27:02 GMT NorksX [0316dec] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/config/StaticResourceConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Brandedmedicineimage.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Distributor.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Manufacturer.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacy.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/enumerations/CompanyRoleType.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineimageRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/CompanyOrchestrationService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/CompanyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/DistributorService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/ManufacturerService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (modified) * src/main/java/mk/ukim/finki/synergymed/service/PharmacyService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/BrandedMedicineServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyOrchestrationServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/CompanyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/DistributorServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/ManufacturerServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/MedicineServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/service/impl/PharmacyServiceImpl.java (added) * src/main/java/mk/ukim/finki/synergymed/web/BrandedMedicineController.java (added) * src/main/resources/application.properties (modified) * src/main/resources/templates/branded-medicine-form.html (added) * src/main/resources/templates/index.html (added) added company services, main page, branded medicine services. Broken ... Thu, 28 Aug 2025 15:15:23 GMT anagjurchinova [58f1801] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/config/OpenApiConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/User.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/UserRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (modified) * src/main/java/mk/ukim/finki/synergymed/web/HomeController.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (modified) * src/main/resources/application.properties (modified) * src/main/resources/templates/login.html (added) Fixed jwt and added login page Thu, 28 Aug 2025 11:47:05 GMT anagjurchinova [1039842] * pom.xml (modified) * src/main/java/mk/ukim/finki/synergymed/SynergyMedApplication.java (modified) * src/main/java/mk/ukim/finki/synergymed/config/ConfigProbe.java (added) * src/main/java/mk/ukim/finki/synergymed/config/SecurityConfig.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/EmailAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidArgumentsException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/InvalidEmailFormatException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/PasswordsMismatchException.java (added) * src/main/java/mk/ukim/finki/synergymed/exceptions/UsernameAlreadyExistsException.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Admin.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Client.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacist.java (modified) * src/main/java/mk/ukim/finki/synergymed/models/User.java (modified) * src/main/java/mk/ukim/finki/synergymed/repositories/UserRepository.java (modified) * src/main/java/mk/ukim/finki/synergymed/security/AppUserDetails.java (added) * src/main/java/mk/ukim/finki/synergymed/security/JwtAuthFilter.java (added) * src/main/java/mk/ukim/finki/synergymed/service/jwt/JwtService.java (added) * src/main/java/mk/ukim/finki/synergymed/web/LoginController.java (added) * src/main/resources/application.properties (modified) Added JWT authentication Wed, 27 Aug 2025 17:53:06 GMT NorksX [c87db71] * .gitattributes (added) * .gitignore (added) * .mvn/wrapper/maven-wrapper.properties (added) * compose.yaml (added) * mvnw (added) * mvnw.cmd (added) * pom.xml (added) * src/main/java/mk/ukim/finki/synergymed/SynergyMedApplication.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Admin.java (added) * src/main/java/mk/ukim/finki/synergymed/models/AllergicreactionHealthprofileMedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/AllergicreactionHealthprofileMedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/BrandedMedicineInstanceofMedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/BrandedMedicineInstanceofMedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Brandedmedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Brandedmedicineimage.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Client.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Clientorder.java (added) * src/main/java/mk/ukim/finki/synergymed/models/ClientorderBrandedmedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/ClientorderBrandedmedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Clubcard.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Company.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Contactinformation.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Deliverycompany.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Distributor.java (added) * src/main/java/mk/ukim/finki/synergymed/models/DistributorBrandedmedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/DistributorBrandedmedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Facility.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Healthprofile.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Inventory.java (added) * src/main/java/mk/ukim/finki/synergymed/models/InventoryBrandedmedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/InventoryBrandedmedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Manufacturer.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Medicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Medicineinteraction.java (added) * src/main/java/mk/ukim/finki/synergymed/models/MedicineinteractionId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Payment.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Paymentmethod.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacist.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Pharmacy.java (added) * src/main/java/mk/ukim/finki/synergymed/models/PharmacyCatalog.java (added) * src/main/java/mk/ukim/finki/synergymed/models/PharmacyCatalogId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Prescription.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Sensitiveclientdata.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Shoppingcart.java (added) * src/main/java/mk/ukim/finki/synergymed/models/ShoppingcartBrandedmedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/ShoppingcartBrandedmedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/Supplyorder.java (added) * src/main/java/mk/ukim/finki/synergymed/models/SupplyorderBrandedmedicine.java (added) * src/main/java/mk/ukim/finki/synergymed/models/SupplyorderBrandedmedicineId.java (added) * src/main/java/mk/ukim/finki/synergymed/models/User.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/AdminRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/AllergicreactionHealthprofileMedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedMedicineInstanceofMedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/BrandedmedicineimageRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientorderBrandedmedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ClientorderRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ClubcardRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/CompanyRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ContactinformationRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/DeliverycompanyRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/DistributorBrandedmedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/DistributorRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/FacilityRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/HealthprofileRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/InventoryBrandedmedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/InventoryRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ManufacturerRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/MedicineinteractionRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/PaymentRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/PaymentmethodRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacistRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacyCatalogRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/PharmacyRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/PrescriptionRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/SensitiveclientdataRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ShoppingcartBrandedmedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/ShoppingcartRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/SupplyorderBrandedmedicineRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/SupplyorderRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/repositories/UserRepository.java (added) * src/main/java/mk/ukim/finki/synergymed/service/BrandedMedicineService.java (added) * src/main/java/mk/ukim/finki/synergymed/service/MedicineService.java (added) * src/main/resources/application.properties (added) * src/test/java/mk/ukim/finki/synergymed/SynergyMedApplicationTests.java (added) initial commit