modif: minor modifications in the application.

mmoehabb · mmoehabb · commit 4c07a59227d9 · 2025-10-21T22:03:27.000+03:00
diff --git a/apps/web/src/components/Checkout/Content.tsx b/apps/web/src/components/Checkout/Content.tsx
@@ -85,7 +85,7 @@ const Content: React.FC<{
   }, [onTransactionStatusUpdate, socket]);
 
   return (
-    <div className="h-full gap-4 md:gap-8 flex flex-col items-center mt-[15vh] mx-auto">
+    <div className="h-full gap-4 md:gap-8 flex flex-col items-center mt-6 short:mt-6 md:mt-[15vh] mx-auto">
       <Header />
 
       <Body
diff --git a/apps/web/src/hooks/lesson.ts b/apps/web/src/hooks/lesson.ts
@@ -3,7 +3,7 @@ import { useUser } from "@litespace/headless/context/user";
 import { useInfiniteLessons } from "@litespace/headless/lessons";
 import { ILesson, Void } from "@litespace/types";
 import dayjs from "@/lib/dayjs";
-import { sortBy } from "lodash";
+import { isEmpty, sortBy } from "lodash";
 
 export function useFindSortedLessons(): {
   list: ILesson.FindUserLessonsApiResponse["list"];
@@ -29,33 +29,30 @@ export function useFindSortedLessons(): {
     size: 15,
   });
 
-  // a callback function that returns true if the futureLessons
-  // state includes the passed lesson id.
-  const futureIncludes = (lessonId: number): boolean => {
-    return !!futureLessons.find(({ lesson }) => lesson.id === lessonId);
-  };
-
   useEffect(() => {
     const now = dayjs().subtract(ILesson.Duration.Long, "minutes");
 
     const futureList = lessons.list?.slice(pastLessons.length) || [];
     const newFutureLessons = futureList.filter(
-      ({ lesson }) => !futureIncludes(lesson.id)
+      ({ lesson }) => !futureLessons.find((l) => l.lesson.id === lesson.id)
     );
 
     const newList =
       lessons.list?.slice(futureLessons.length + pastLessons.length) || [];
     const newPastLessons = newList.filter((l) => now.isAfter(l.lesson.start));
 
-    setFutureLessons((prev) =>
-      sortBy(
-        [...prev, ...newFutureLessons],
-        (l) => !!l.lesson.canceledAt || l.lesson.reported,
-        (l) => l.lesson.start
-      )
-    );
+    if (!isEmpty(newFutureLessons)) {
+      setFutureLessons((prev) =>
+        sortBy(
+          [...prev, ...newFutureLessons],
+          (l) => !!l.lesson.canceledAt || l.lesson.reported,
+          (l) => l.lesson.start
+        )
+      );
+    }
+
     setPastLessons((prev) => [...prev, ...newPastLessons]);
-  }, [lessons.list, futureLessons.length, pastLessons.length]);
+  }, [lessons.list, futureLessons, futureLessons.length, pastLessons.length]);
 
   return useMemo(
     () => ({
diff --git a/apps/web/src/pages/Root.tsx b/apps/web/src/pages/Root.tsx
@@ -130,12 +130,12 @@ const Root: React.FC = () => {
         !cache.load(CacheKey.TourFinished)
       ) {
         navigate(Web.Tutors);
-        studentTour.start();
+        // studentTour.start();
         return;
       }
       return navigate(Web.StudentDashboard);
     }
-  }, [navigate, location.pathname, user, publicRoute, meta, studentTour]);
+  }, [navigate, location.pathname, user, publicRoute, meta]);
 
   const showNavigation = useMemo(() => {
     if (params.get("nav") === "false") return false;
diff --git a/packages/ui/src/components/ConfirmationDialog/ConfirmationDialog.tsx b/packages/ui/src/components/ConfirmationDialog/ConfirmationDialog.tsx
@@ -154,7 +154,8 @@ export const ConfirmationDialog: React.FC<{
           aria-describedby={description}
           dir="rtl"
           className={cn(
-            "fixed bg-natural-50 border border-border-strong rounded-xl shadow-lg shadow-dialog-confirm p-6 z-confirm-dialog-content",
+            "fixed bg-natural-50 border border-border-strong rounded-xl",
+            "shadow-lg shadow-dialog-confirm p-6 z-confirm-dialog-content",
             {
               "left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2":
                 dialogPosition === "center",
@@ -165,7 +166,7 @@ export const ConfirmationDialog: React.FC<{
             className
           )}
         >
-          <div className="flex items-center justify-between mb-4">
+          <div className="flex max-h-screen items-center justify-between mb-4">
             <div
               className={cn(
                 "w-12 h-12 border-8 rounded-full flex items-center justify-center",
diff --git a/packages/ui/src/components/Dialog/Dialog.tsx b/packages/ui/src/components/Dialog/Dialog.tsx
@@ -120,7 +120,7 @@ export const Dialog: React.FC<{
           dir="rtl"
           aria-describedby={description}
           className={cn(
-            "fixed bg-natural-50 focus-visible:ring-brand-500 overflow-hidden z-dialog",
+            "fixed max-h-screen bg-natural-50 focus-visible:ring-brand-500 overflow-hidden z-dialog",
             {
               "w-full": !mq.sm,
               "p-4 sm:p-6": variant === "default",
diff --git a/packages/ui/src/components/IframeDialog/IframeDialog.tsx b/packages/ui/src/components/IframeDialog/IframeDialog.tsx
@@ -41,7 +41,7 @@ export const IframeDialog: React.FC<{
           ) : (
             <div
               className={cn(
-                "w-full h-full sm:w-[512px] sm:h-[750px] bg-natural-50",
+                "w-full h-full sm:w-[512px] sm:h-[750px] bg-natural-50 max-h-[calc(100vh-64px)]",
                 "absolute top-16 sm:top-1/2 sm:left-1/2 sm:-translate-x-1/2 sm:-translate-y-1/2 z-iframe-dialog-conent"
               )}
             >
diff --git a/packages/ui/src/components/Lessons/CancelLesson/CancelLesson.tsx b/packages/ui/src/components/Lessons/CancelLesson/CancelLesson.tsx
@@ -25,11 +25,11 @@ export const CancelLesson: React.FC<{
       className="!w-[400px] text-caption text-natural-700"
       actions={{
         primary: {
-          label: intl("labels.confirm"),
+          label: intl("labels.i-will-continue"),
           onClick: close,
         },
         secondary: {
-          label: isStudent ? intl("labels.go-back") : intl("labels.cancel"),
+          label: intl("labels.cancel-lesson"),
           onClick: onCancel,
           loading: loading,
           disabled: loading,
diff --git a/packages/ui/src/locales/ar-eg.json b/packages/ui/src/locales/ar-eg.json
@@ -918,8 +918,8 @@
   "book-lesson.edit": "تعديل الموعد",
   "book-lesson.loading-slots": "برجاء الانتظار، جاري احضار جدول {tutor}",
   "book-lesson.error-slots": "عذرًا، حدث خطأ أثناء تحميل الجدول!",
-  "book-lesson.empty-slots": "لا توجد مواعيد متاحة",
-  "book-lesson.empty-slots-at-this-time": "لا توجد مواعيد متاحة في هذا الوقت",
+  "book-lesson.empty-slots": "جميع المواعيد المتاحة محجوزة",
+  "book-lesson.empty-slots-at-this-time": "جميع المواعيد المتاحة في هذا الوقت محجوزة",
   "book-lesson.success": "تم حجز الحصة بنجاح مع {tutor}",
   "book-lesson.error": "حدث خطأ أثناء حجز الحصة، برجاء المحاولة مرة أخرى",
   "book-lesson.success.activate-notifications.desc": "الاشعارات هي وسيلة ممتازة حتي تعلم كل جديد في المنصة مثل",
@@ -1056,7 +1056,8 @@
   "labels.currency.egp": "{value} ج.م",
   "labels.next": "التالي",
   "labels.prev": "السابق",
-  "labels.confirm": "سأستمر",
+  "labels.confirm": "تأكيد",
+  "labels.i-will-continue": "سأستمر",
   "labels.report": "إبلاغ",
   "labels.name": "الاسم باللغة العربية",
   "labels.gender": "الهوية",
@@ -1113,13 +1114,14 @@
   "labels.litespace": "LiteSpace",
   "labels.delete": "حذف",
   "labels.share": "مشاركة",
-  "labels.go-back": "الغاء الحصة",
+  "labels.go-back": "الرجوع",
   "labels.done": "تم",
   "labels.file-upload-done": "اكتمل رفع الملف",
   "labels.file-upload-failed": "تعذر رفع الملف",
   "labels.file-upload-inprogress": "جاري رفع الملف",
   "labels.file-upload-canceled": "تم إلغاء التحميل",
   "labels.cancel": "إلغاء",
+  "labels.cancel-lesson": "إلغاء الحصة",
   "labels.back-to-site": "الرجوع الي الموقع",
   "labels.percent.placeholder": "%10",
   "labels.continue-with-cam": "استمرار بالكاميرا",
diff --git a/packages/ui/tailwind.config.js b/packages/ui/tailwind.config.js
@@ -90,6 +90,7 @@ export default {
         "2xs": "400px",
         xs: "480px",
         "3xl": "1600px",
+        short: { raw: "(max-height: 600px)" },
       },
       containers: {
         "2md": "30rem",

Original file line number	Diff line number	Diff line change
`@@ -130,12 +130,12 @@ const Root: React.FC = () => {`
`130`	`130`	`!cache.load(CacheKey.TourFinished)`
`131`	`131`	`) {`
`132`	`132`	`navigate(Web.Tutors);`
`133`		`- studentTour.start();`
	`133`	`+ // studentTour.start();`
`134`	`134`	`return;`
`135`	`135`	`}`
`136`	`136`	`return navigate(Web.StudentDashboard);`
`137`	`137`	`}`
`138`		`- }, [navigate, location.pathname, user, publicRoute, meta, studentTour]);`
	`138`	`+ }, [navigate, location.pathname, user, publicRoute, meta]);`
`139`	`139`
`140`	`140`	`const showNavigation = useMemo(() => {`
`141`	`141`	`if (params.get("nav") === "false") return false;`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ export const Dialog: React.FC<{`
`120`	`120`	`dir="rtl"`
`121`	`121`	`aria-describedby={description}`
`122`	`122`	`className={cn(`
`123`		`- "fixed bg-natural-50 focus-visible:ring-brand-500 overflow-hidden z-dialog",`
	`123`	`+ "fixed max-h-screen bg-natural-50 focus-visible:ring-brand-500 overflow-hidden z-dialog",`
`124`	`124`	`{`
`125`	`125`	`"w-full": !mq.sm,`
`126`	`126`	`"p-4 sm:p-6": variant === "default",`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export const IframeDialog: React.FC<{`
`41`	`41`	`) : (`
`42`	`42`	`<div`
`43`	`43`	`className={cn(`
`44`		`- "w-full h-full sm:w-[512px] sm:h-[750px] bg-natural-50",`
	`44`	`+ "w-full h-full sm:w-[512px] sm:h-[750px] bg-natural-50 max-h-[calc(100vh-64px)]",`
`45`	`45`	`"absolute top-16 sm:top-1/2 sm:left-1/2 sm:-translate-x-1/2 sm:-translate-y-1/2 z-iframe-dialog-conent"`
`46`	`46`	`)}`
`47`	`47`	`>`