diff --git a/backend/backend_api/models.py b/backend/backend_api/models.py index 111bae3..1f27680 100644 --- a/backend/backend_api/models.py +++ b/backend/backend_api/models.py @@ -151,8 +151,8 @@ def google_calendar_link(self): base_url = "https://www.google.com/calendar/render?action=TEMPLATE" workshop_title = escape(self.name) workshop_description = escape(self.desc) - start_datetime = self.start_date.strftime("%Y%m%dT%H%M%S") - end_datetime = self.end_date.strftime("%Y%m%dT%H%M%S") + start_datetime = self.start_date.strftime("%Y%m%dT%H%M%SZ") + end_datetime = self.end_date.strftime("%Y%m%dT%H%M%SZ") teachers_names = " ".join([teacher.name for teacher in self.teachers.all()]) event_details = f"Teachers: {teachers_names}\nDescription: {workshop_description}" @@ -223,8 +223,8 @@ def google_calendar_link(self): base_url = "https://www.google.com/calendar/render?action=TEMPLATE" presentation_title = escape(self.name) presentation_description = escape(self.desc) - start_datetime = self.start_date.strftime("%Y%m%dT%H%M%S") - end_datetime = self.end_date.strftime("%Y%m%dT%H%M%S") + start_datetime = self.start_date.strftime("%Y%m%dT%H%M%SZ") + end_datetime = self.end_date.strftime("%Y%m%dT%H%M%SZ") presenters_names = " ".join([presenter.name for presenter in self.presenters.all()]) event_details = f"Presenters: {presenters_names}\nDescription: {presentation_description}" diff --git a/frontend/src/components/item-card/item-card.jsx b/frontend/src/components/item-card/item-card.jsx index 901f7b2..1ddc6ba 100644 --- a/frontend/src/components/item-card/item-card.jsx +++ b/frontend/src/components/item-card/item-card.jsx @@ -26,7 +26,8 @@ export const Cost = ({ cost }) => ( sx={{ fontSize: 14, color: "text.secondary" }} lineHeight={1.5} > - {cost} T 0 T + {cost}T + 0T ( }} lineHeight={1.5} > - Paid by Bale Messeger + Paid by Bale Messenger diff --git a/frontend/src/pages/my-account/MyAccount.jsx b/frontend/src/pages/my-account/MyAccount.jsx index e387232..35474dd 100644 --- a/frontend/src/pages/my-account/MyAccount.jsx +++ b/frontend/src/pages/my-account/MyAccount.jsx @@ -145,7 +145,10 @@ const MyAccount = () => { return ( - Total: {total !== 0 && {total} T} 0 T + + Total: {total !== 0 && {total}T}{' '} + 0T + ); };