From 7f904bf68cb121601f4f60097b423231c3c86313 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Thu, 28 Nov 2024 03:44:36 +1030 Subject: [PATCH 01/12] feat: copy calendar to clipboard --- src/components/Calendar.tsx | 43 ++++++++++++++++++++++++++++++++++ src/components/ExportModal.tsx | 0 src/helpers/export-calendar.ts | 20 ++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 src/components/ExportModal.tsx create mode 100644 src/helpers/export-calendar.ts diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index 212df35..21a7efb 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -9,6 +9,7 @@ import { YEAR } from '../constants/year'; import { useCourseColor, useEnrolledCourse } from '../data/enrolled-courses'; import { useCalendar, useOtherWeekCourseTimes } from '../helpers/calendar'; import { useCalendarHourHeight } from '../helpers/calendar-hour-height'; +import { useExportCalendar } from '../helpers/export-calendar'; import { calcHoursDuration } from '../helpers/hours-duration'; import { useZoom } from '../helpers/zoom'; import type dayjs from '../lib/dayjs'; @@ -175,6 +176,47 @@ const CalendarHeader = ({ ); }; +const EndButtons = () => { + const blockHeight = useCalendarHourHeight((s) => s.height); + + const { copy, exportFile } = useExportCalendar(); + + return ( +
+ + + + + + + +
+ ); +}; + const CalendarBg = ({ currentWeek }: { currentWeek: dayjs.Dayjs }) => { const { t } = useTranslation(); @@ -384,6 +426,7 @@ export const Calendar = () => { {isDragging && } + ); diff --git a/src/components/ExportModal.tsx b/src/components/ExportModal.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/helpers/export-calendar.ts b/src/helpers/export-calendar.ts new file mode 100644 index 0000000..7c9ec64 --- /dev/null +++ b/src/helpers/export-calendar.ts @@ -0,0 +1,20 @@ +import { toast } from 'sonner'; + +import { useDetailedEnrolledCourses } from '../data/enrolled-courses'; + +export const useExportCalendar = () => { + const enrolledCourses = useDetailedEnrolledCourses(); + const copy = async () => { + const res = enrolledCourses.map((c) => ({ + name: c.name.title + '\n' + c.name.subject + ' ' + c.name.code, + classes: c.classes + .map(({ type, classNumber }) => type + ': ' + classNumber) + .join('\n'), + })); + const resStr = res.map((d) => d.name + '\n\n' + d.classes).join('\n\n\n'); + await navigator.clipboard.writeText(resStr); + toast.success('Copied to clipboard!'); + }; + const exportFile = () => {}; + return { copy, exportFile }; +}; From 11d319b929d0126a6e28457dca8a5038c3472319 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Thu, 28 Nov 2024 23:31:07 +1030 Subject: [PATCH 02/12] feat: ready for enrolment modal --- src/components/Calendar.tsx | 21 +++++++-- src/components/EnrolmentModal.tsx | 71 +++++++++++++++++++++++++++++++ src/components/ExportModal.tsx | 0 3 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 src/components/EnrolmentModal.tsx delete mode 100644 src/components/ExportModal.tsx diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index 21a7efb..eb47506 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -1,4 +1,4 @@ -import { Button, Tooltip } from '@nextui-org/react'; +import { Button, Tooltip, useDisclosure } from '@nextui-org/react'; import clsx from 'clsx'; import { useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -16,6 +16,7 @@ import type dayjs from '../lib/dayjs'; import type { DateTimeRange, WeekCourse, WeekCourses } from '../types/course'; import { timeToDayjs } from '../utils/date'; import { useDrag, useDrop } from '../utils/dnd'; +import { EnrolmentModal } from './EnrolmentModal'; type DraggingCourseState = { isDragging: boolean; @@ -179,6 +180,11 @@ const CalendarHeader = ({ const EndButtons = () => { const blockHeight = useCalendarHourHeight((s) => s.height); + const { + isOpen: isReadyModalOpen, + onOpen: onReadyModalOpen, + onOpenChange: onReadyModalOpenChange, + } = useDisclosure(); const { copy, exportFile } = useExportCalendar(); return ( @@ -198,9 +204,18 @@ const EndButtons = () => { 📋 - + + + + + ); +}; diff --git a/src/components/ExportModal.tsx b/src/components/ExportModal.tsx deleted file mode 100644 index e69de29..0000000 From fe05aebeae7f1e30dbf69d141d85a21e148b507d Mon Sep 17 00:00:00 2001 From: jsun969 Date: Sat, 30 Nov 2024 15:10:46 +1030 Subject: [PATCH 03/12] feat: add ad for copy sharing --- src/helpers/export-calendar.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/helpers/export-calendar.ts b/src/helpers/export-calendar.ts index 7c9ec64..7811804 100644 --- a/src/helpers/export-calendar.ts +++ b/src/helpers/export-calendar.ts @@ -11,8 +11,10 @@ export const useExportCalendar = () => { .map(({ type, classNumber }) => type + ': ' + classNumber) .join('\n'), })); - const resStr = res.map((d) => d.name + '\n\n' + d.classes).join('\n\n\n'); - await navigator.clipboard.writeText(resStr); + const resStr = res.map((d) => d.name + '\n\n' + d.classes).join('\n\n'); + const advertisement = + 'Planned with MyTimeTable\nhttps://mytimetable.csclub.org.au/'; + await navigator.clipboard.writeText(resStr + '\n\n\n' + advertisement); toast.success('Copied to clipboard!'); }; const exportFile = () => {}; From 54f8a7fb0520561bcd11950a60d0a64a13702cae Mon Sep 17 00:00:00 2001 From: jsun969 Date: Sat, 30 Nov 2024 15:11:31 +1030 Subject: [PATCH 04/12] fix: typo --- src/helpers/export-calendar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/export-calendar.ts b/src/helpers/export-calendar.ts index 7811804..e6d7003 100644 --- a/src/helpers/export-calendar.ts +++ b/src/helpers/export-calendar.ts @@ -13,7 +13,7 @@ export const useExportCalendar = () => { })); const resStr = res.map((d) => d.name + '\n\n' + d.classes).join('\n\n'); const advertisement = - 'Planned with MyTimeTable\nhttps://mytimetable.csclub.org.au/'; + 'Planned with MyTimetable\nhttps://mytimetable.csclub.org.au/'; await navigator.clipboard.writeText(resStr + '\n\n\n' + advertisement); toast.success('Copied to clipboard!'); }; From beb1a30269fde3ae7978986586a2c5e16d0d93c3 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Thu, 5 Dec 2024 01:29:24 +1030 Subject: [PATCH 05/12] feat: remove export as file button --- src/components/Calendar.tsx | 16 ++-------------- src/helpers/export-calendar.ts | 5 ++--- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index eb47506..d9e8145 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -185,7 +185,7 @@ const EndButtons = () => { onOpen: onReadyModalOpen, onOpenChange: onReadyModalOpenChange, } = useDisclosure(); - const { copy, exportFile } = useExportCalendar(); + const { copyText } = useExportCalendar(); return (
{ size="lg" isIconOnly className="text-2xl" - onPress={copy} + onPress={copyText} > 📋 @@ -216,18 +216,6 @@ const EndButtons = () => { isOpen={isReadyModalOpen} onOpenChange={onReadyModalOpenChange} /> - - -
); }; diff --git a/src/helpers/export-calendar.ts b/src/helpers/export-calendar.ts index e6d7003..21ac071 100644 --- a/src/helpers/export-calendar.ts +++ b/src/helpers/export-calendar.ts @@ -4,7 +4,7 @@ import { useDetailedEnrolledCourses } from '../data/enrolled-courses'; export const useExportCalendar = () => { const enrolledCourses = useDetailedEnrolledCourses(); - const copy = async () => { + const copyText = async () => { const res = enrolledCourses.map((c) => ({ name: c.name.title + '\n' + c.name.subject + ' ' + c.name.code, classes: c.classes @@ -17,6 +17,5 @@ export const useExportCalendar = () => { await navigator.clipboard.writeText(resStr + '\n\n\n' + advertisement); toast.success('Copied to clipboard!'); }; - const exportFile = () => {}; - return { copy, exportFile }; + return { copyText }; }; From 333bc01117ba0e2e303721e910bf38573194d8f7 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Thu, 5 Dec 2024 02:37:10 +1030 Subject: [PATCH 06/12] feat: i18n --- src/components/Calendar.tsx | 10 ++++++---- src/components/EnrolmentModal.tsx | 5 ++++- src/helpers/export-calendar.ts | 5 ++++- src/locales/en-au.json | 7 ++++++- src/locales/zh-cn.json | 7 ++++++- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index d9e8145..0f06015 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -177,7 +177,9 @@ const CalendarHeader = ({ ); }; -const EndButtons = () => { +const EndActions = () => { + const { t } = useTranslation(); + const blockHeight = useCalendarHourHeight((s) => s.height); const { @@ -192,7 +194,7 @@ const EndButtons = () => { className="absolute -bottom-[0.5rem] left-0 flex w-full items-center justify-center gap-4" style={{ height: blockHeight + 'rem' }} > - + { {isDragging && } - + ); diff --git a/src/components/EnrolmentModal.tsx b/src/components/EnrolmentModal.tsx index 646cd6f..cf3aae4 100644 --- a/src/components/EnrolmentModal.tsx +++ b/src/components/EnrolmentModal.tsx @@ -12,6 +12,7 @@ import { ModalHeader, } from '@nextui-org/react'; import clsx from 'clsx'; +import { useTranslation } from 'react-i18next'; import { useDetailedEnrolledCourses } from '../data/enrolled-courses'; @@ -20,6 +21,8 @@ type ReadyModalProps = { onOpenChange: (isOpen: boolean) => void; }; export const EnrolmentModal = ({ isOpen, onOpenChange }: ReadyModalProps) => { + const { t } = useTranslation(); + const enrolledCourses = useDetailedEnrolledCourses(); const isOnlyCourse = enrolledCourses.length === 1; @@ -30,7 +33,7 @@ export const EnrolmentModal = ({ isOpen, onOpenChange }: ReadyModalProps) => { size={isOnlyCourse ? 'xs' : '2xl'} > - Ready for Enrolment + {t('calendar.end-actions.ready')} {enrolledCourses.map((c) => ( diff --git a/src/helpers/export-calendar.ts b/src/helpers/export-calendar.ts index 21ac071..b3d432d 100644 --- a/src/helpers/export-calendar.ts +++ b/src/helpers/export-calendar.ts @@ -1,8 +1,11 @@ +import { useTranslation } from 'react-i18next'; import { toast } from 'sonner'; import { useDetailedEnrolledCourses } from '../data/enrolled-courses'; export const useExportCalendar = () => { + const { t } = useTranslation(); + const enrolledCourses = useDetailedEnrolledCourses(); const copyText = async () => { const res = enrolledCourses.map((c) => ({ @@ -15,7 +18,7 @@ export const useExportCalendar = () => { const advertisement = 'Planned with MyTimetable\nhttps://mytimetable.csclub.org.au/'; await navigator.clipboard.writeText(resStr + '\n\n\n' + advertisement); - toast.success('Copied to clipboard!'); + toast.success(t('calendar.end-actions.copy-success')); }; return { copyText }; }; diff --git a/src/locales/en-au.json b/src/locales/en-au.json index 00f6d64..84c83e2 100644 --- a/src/locales/en-au.json +++ b/src/locales/en-au.json @@ -39,7 +39,12 @@ "November", "December" ], - "immoveable-course": "Immoveable course" + "immoveable-course": "Immoveable course", + "end-actions": { + "copy": "Copy to clipboard", + "ready": "Ready for Enrolment", + "copy-success": "Copied to clipboard!" + } }, "help": { "title": "How to use MyTimetable", diff --git a/src/locales/zh-cn.json b/src/locales/zh-cn.json index d9e410d..74040a2 100644 --- a/src/locales/zh-cn.json +++ b/src/locales/zh-cn.json @@ -39,7 +39,12 @@ "十一月", "十二月" ], - "immoveable-course": "此课程无法移动" + "immoveable-course": "此课程无法移动", + "end-actions": { + "copy": "复制到剪切板", + "ready": "准备选课", + "copy-success": "已成功复制到剪切板！" + } }, "help": { "title": "如何使用 MyTimetable", From f276609de7632e012214bf26dcbf9b5464b04644 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Sat, 7 Dec 2024 13:43:17 +1030 Subject: [PATCH 07/12] feat(help): add ready button --- public/help/ready-button.webp | Bin 0 -> 9246 bytes src/components/HelpModal.tsx | 7 +++++++ src/locales/en-au.json | 3 ++- src/locales/zh-cn.json | 3 ++- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 public/help/ready-button.webp diff --git a/public/help/ready-button.webp b/public/help/ready-button.webp new file mode 100644 index 0000000000000000000000000000000000000000..c9a40c881665a995e8f48bf911d626db94c891b0 GIT binary patch literal 9246 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 literal 0 HcmV?d00001 diff --git a/src/components/HelpModal.tsx b/src/components/HelpModal.tsx index 1b67bb7..cdc909a 100644 --- a/src/components/HelpModal.tsx +++ b/src/components/HelpModal.tsx @@ -66,6 +66,13 @@ export const HelpModal = () => { alt: 'Course modal to change class time', }, }, + { + content: t('help.steps.ready-button'), + image: { + path: '/help/ready-button.webp', + alt: 'Ready button at bottom', + }, + }, { content: t('help.steps.access-adelaide'), image: { diff --git a/src/locales/en-au.json b/src/locales/en-au.json index 84c83e2..59758d0 100644 --- a/src/locales/en-au.json +++ b/src/locales/en-au.json @@ -56,7 +56,8 @@ "change-week": "Change the calendar week to see more classes.", "course-details": "Click your enrolled course to see details of your enrolled classes.", "course-modal": "If you encounter any class clashes when using MyTimetable, you can open the modal to change the class.", - "access-adelaide": "You can enrol for courses in Access Adelaide by using the class numbers, once you are happy with your class times." + "ready-button": "Once you are satisfied with your class times, click the \"Ready for Enrollment\" button at the bottom of the calendar.", + "access-adelaide": "You can easily enroll in courses on Access Adelaide using the class numbers shown in the modal." }, "actions": { "next-step": "Next Step", diff --git a/src/locales/zh-cn.json b/src/locales/zh-cn.json index 74040a2..ff5288d 100644 --- a/src/locales/zh-cn.json +++ b/src/locales/zh-cn.json @@ -56,7 +56,8 @@ "change-week": "切换周数查看更多课程", "course-details": "点击你的选课查看详情", "course-modal": "如果在使用 MyTimetable 时遇到任何课程冲突，可以随时打开详情弹窗来更改课程", - "access-adelaide": "课程调整完毕后，可以使用详情中的 Class Number 在 Access Adelaide 中进行选课" + "ready-button": "课程调整完毕后，点击日历底部的“准备选课”按钮", + "access-adelaide": "你可以用弹窗中的 Class Number 在 Access Adelaide 中进行选课" }, "actions": { "next-step": "下一步", From 1e888fccbbb4b985e9b99992106fe659f395d036 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Sat, 7 Dec 2024 13:45:57 +1030 Subject: [PATCH 08/12] feat(tip): abbreviation --- src/components/Tips.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/Tips.tsx b/src/components/Tips.tsx index a30bea6..154230d 100644 --- a/src/components/Tips.tsx +++ b/src/components/Tips.tsx @@ -44,6 +44,7 @@ const TIPS = [ CS Club Open Source Team to work on projects like this! , + <>You can search for courses using abbreviations, ]; const tips = shuffle(TIPS); From 6e40df8a2c0b0dd1d7970d53315c88793a225580 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Sat, 7 Dec 2024 23:17:31 +1030 Subject: [PATCH 09/12] feat(calendar): hide bottom actions if no courses enrolled --- src/components/Calendar.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index 0f06015..2337420 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -6,7 +6,11 @@ import { create } from 'zustand'; import { WEEK_DAYS } from '../constants/week-days'; import { YEAR } from '../constants/year'; -import { useCourseColor, useEnrolledCourse } from '../data/enrolled-courses'; +import { + useCourseColor, + useEnrolledCourse, + useEnrolledCourses, +} from '../data/enrolled-courses'; import { useCalendar, useOtherWeekCourseTimes } from '../helpers/calendar'; import { useCalendarHourHeight } from '../helpers/calendar-hour-height'; import { useExportCalendar } from '../helpers/export-calendar'; @@ -420,6 +424,8 @@ export const Calendar = () => { }, }); + const noCourses = useEnrolledCourses((s) => s.courses.length === 0); + return (
{ {isDragging && } - + {!noCourses && }
); From f27b96bace505099f159849141643ab809680296 Mon Sep 17 00:00:00 2001 From: jsun969 Date: Sun, 8 Dec 2024 13:44:40 +1030 Subject: [PATCH 10/12] feat: move copy button to ready modal --- src/components/Calendar.tsx | 13 +------------ src/components/EnrolmentModal.tsx | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/components/Calendar.tsx b/src/components/Calendar.tsx index 2337420..0c15af4 100644 --- a/src/components/Calendar.tsx +++ b/src/components/Calendar.tsx @@ -198,18 +198,7 @@ const EndActions = () => { className="absolute -bottom-[0.5rem] left-0 flex w-full items-center justify-center gap-4" style={{ height: blockHeight + 'rem' }} > - - - + {/* TODO: Share Button */} +