Merge branch 'master' of https://github.com/AAISS/AAISS-2023

AAISS · Jan 15, 2025 · 323e973 · 323e973
2 parents d49cca4 + ff3f7fe
commit 323e973
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git 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
@@ -26,7 +26,8 @@ export const Cost = ({ cost }) => (
       sx={{ fontSize: 14, color: "text.secondary" }}
       lineHeight={1.5}
     >
-      <span style={{ textDecoration: "line-through" }}>{cost} T</span> 0 T
+      <span class="text-sm " style={{ textDecoration: "line-through" }}>{cost}T</span>
+       <span class="text-lg pl-1 font-bold">0T</span>
     </Typography>
     <Typography
       sx={{
@@ -36,7 +37,7 @@ export const Cost = ({ cost }) => (
       }}
       lineHeight={1.5}
     >
-      Paid by Bale Messeger
+      Paid by Bale Messenger
     </Typography>
   </Stack>
 </Stack>

diff --git a/frontend/src/pages/my-account/MyAccount.jsx b/frontend/src/pages/my-account/MyAccount.jsx
@@ -145,7 +145,10 @@ const MyAccount = () => {
 
     return (
       <Typography variant="overline" sx={{ fontSize: 14 }} color="text.secondary">
-        Total: {total !== 0 && <span style={{ textDecoration: "line-through" }}>{total} T</span>} 0 T
+
+        Total: {total !== 0 && <span class="text-sm " style={{ textDecoration: "line-through" }}>{total}T</span>}{' '}
+       <span class="text-lg pl-1 font-bold">0T</span>
+
       </Typography>
     );
   };