Merge branch 'main' into fix-refresh-matchmaking

frontend/components/account/Profile.tsx

@@ -107,7 +107,7 @@ function Profile() {
                         dialogOpen={isDialogOpen}
                         onDialogOpenChange={manageDialog} // Allow toggling the dialog
                         text="Update Profile"
-                        className="w-fit bg-btn text-white text-sm py-2 px-4 rounded-md hover:bg-purple-700"
+                        className="w-fit bg-btn text-white text-sm py-2 px-4 rounded-md"
                         type="button"
                         variant="primary"
                         description="Are you sure you want to update your profile?"

frontend/components/account/Settings.tsx

@@ -120,7 +120,7 @@ function Setting() {
                             dialogOpen={isUpdateDialogOpen}
                             onDialogOpenChange={manageUpdateDialog}
                             text="Update Settings"
-                            className="w-fit bg-btn text-white text-sm py-2 px-4 rounded-md hover:bg-theme-700"
+                            className="w-fit bg-btn text-white text-sm py-2 px-4 rounded-md"
                             type="button"
                             variant="primary"
                             description="Are you sure you want to update your settings?"

frontend/components/customs/custom-dialog.tsx

@@ -56,7 +56,7 @@ function CustomDialogWithButton(props: CustomDialogProps) {
                         <DialogTitle>
                             <div className="flex flex-row gap-5">
                                 <ErrorIconDialog />
-                                Warning
+                                {props.text || 'Warning'}
                             </div>
                             <span className="h-0.5 w-full bg-slate-200 mt-5"></span>
                         </DialogTitle>

frontend/components/customs/datatable.tsx

@@ -65,7 +65,7 @@ export default function Datatable({
             <Table>
                 <TableHeader>
                     <TableRow>
-                        <TableHead>{hideIdx ? null : 'No.'}</TableHead>
+                        <TableHead style={{ width: '5%' }}>{hideIdx ? null : 'No.'}</TableHead>
                         {columns.map((elem) => {
                             if (elem.isHidden) {
                                 return null
@@ -129,21 +129,22 @@ export default function Datatable({
                                                     <DeleteIcon />
                                                 </Button>
                                             )}
-                                            {col.customAction && col.customAction.formatter ? (
-                                                col.customAction.formatter(elem, router)
-                                            ) : (
-                                                <Button
-                                                    variant="iconNoBorder"
-                                                    size="icon"
-                                                    onClick={() => {
-                                                        if (col.customAction && col.customAction.onClick) {
-                                                            col.customAction.onClick(elem)
-                                                        }
-                                                    }}
-                                                >
-                                                    {col.customAction?.customActionIcon}
-                                                </Button>
-                                            )}
+                                            {col.customAction &&
+                                                (col.customAction.formatter ? (
+                                                    col.customAction.formatter(elem, router)
+                                                ) : (
+                                                    <Button
+                                                        variant="iconNoBorder"
+                                                        size="icon"
+                                                        onClick={() => {
+                                                            if (col.customAction && col.customAction.onClick) {
+                                                                col.customAction.onClick(elem)
+                                                            }
+                                                        }}
+                                                    >
+                                                        {col.customAction?.customActionIcon}
+                                                    </Button>
+                                                ))}
                                         </TableCell>
                                     )
                                 }

frontend/components/dashboard/new-session.tsx

@@ -14,6 +14,7 @@ import { addUserToMatchmaking } from '../../services/matching-service-api'
 import CustomModal from '../customs/custom-modal'
 import Loading from '../customs/loading'
 import { capitalizeFirstLowerRest } from '@/util/string-modification'
+import { encodeStr } from '@/util/encryption'
 
 export const NewSession = () => {
     const router = useRouter()
@@ -109,7 +110,8 @@ export const NewSession = () => {
                 switch (newMessage.type) {
                     case WebSocketMessageType.SUCCESS:
                         updateMatchmakingStatus(MatchingStatus.MATCH_FOUND, newMessage.matchId)
-                        router.push(`/code/${newMessage.matchId}`)
+                        const encodedId = encodeStr(newMessage.matchId)
+                        router.push(`/code/${encodedId}`)
                         break
                     case WebSocketMessageType.FAILURE:
                         socketRef.current?.close()
@@ -204,7 +206,7 @@ export const NewSession = () => {
                     </SelectContent>
                 </Select>
             </div>
-            <Button className="mt-4 bg-purple-600 hover:bg-[#A78BFA]" onClick={handleMatchmaking}>
+            <Button variant="primary" onClick={handleMatchmaking}>
                 Start matchmaking
             </Button>
 
@@ -267,7 +269,7 @@ export const NewSession = () => {
                                 <Button
                                     variant={'ghostTabLabel'}
                                     size={'lg'}
-                                    onClick={() => void router.push(`/code/${modalData.matchId}`)}
+                                    onClick={() => void router.push(`/code/${encodeStr(modalData.matchId)}`)}
                                 >
                                     Proceed to coding session
                                 </Button>

frontend/components/dashboard/resume-session.tsx

@@ -3,6 +3,8 @@ import { Button } from '../ui/button'
 import { IMatch } from '@repo/user-types'
 import { convertSortedComplexityToComplexity } from '@repo/question-types'
 import { capitalizeFirstLowerRest } from '@/util/string-modification'
+import { encodeStr } from '@/util/encryption'
+import { toast } from 'sonner'
 
 interface IResumeSessionProps {
     match: IMatch
@@ -18,8 +20,11 @@ export default function ResumeSession({ match, isOngoing }: IResumeSessionProps)
         try {
             const ongoing = await isOngoing()
             if (!ongoing) return
-            router.push(`/code/${match.id}`)
-        } catch (error) {}
+            const encodedId = encodeStr(match.id)
+            router.push(`/code/${encodedId}`)
+        } catch (error) {
+            toast.error('Unable to resume session due to a server error')
+        }
     }
 
     return (

frontend/components/ui/button.tsx

@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority'
 import { cn } from '@/lib/utils'
 
 const buttonVariants = cva(
-    'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50',
+    'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-gray-300 disabled:pointer-events-none disabled:opacity-50',
     {
         variants: {
             variant: {
@@ -16,7 +16,7 @@ const buttonVariants = cva(
                 link: 'text-primary underline-offset-4 hover:underline',
                 icon: 'bg-transparent border-[1px] rounded-xl hover:bg-btn-secondaryHover',
                 iconNoBorder: 'hover:bg-btn-hover',
-                primary: 'bg-theme-600 hover:bg-theme-700 text-primary-foreground',
+                primary: 'bg-theme-600 hover:bg-theme-700 text-primary-foreground focus-visible:ring-gray-500',
                 activeTab:
                     'text-foreground bg-transparent hover:bg-btn-hover rounded-b-none border-b-2 border-theme-600',
                 ghostTab: 'text-foreground bg-transparent hover:bg-btn-hover rounded-b-none',

frontend/components/ui/dialog.tsx

@@ -21,7 +21,7 @@ const DialogOverlay = React.forwardRef<
     <DialogPrimitive.Overlay
         ref={ref}
         className={cn(
-            'fixed inset-0 z-50 bg-slate-200/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+            'fixed inset-0 z-[995] bg-slate-200/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
             className
         )}
         {...props}
@@ -38,7 +38,7 @@ const DialogContent = React.forwardRef<
         <DialogPrimitive.Content
             ref={ref}
             className={cn(
-                'fixed left-[50%] top-[50%] z-50 grid w-full max-w-3xl translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-7 px-10 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+                'fixed left-[50%] top-[50%] z-[995] grid w-full max-w-3xl translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-7 px-10 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
                 'flex flex-grow flex-col h-1/4 bg-white bg-opacity-100',
                 className
             )}

frontend/pages/code/[id]/index.tsx

@@ -23,14 +23,16 @@ import TestResult from '../../../components/code/test-result'
 import { getChatHistory, getCollabHistory } from '@/services/collaboration-service-api'
 import ReadOnlyCodeMirrorEditor from '../../../components/code/read-only-editor'
 import { ResultModel } from '@repo/collaboration-types'
+import { decodeStr } from '@/util/encryption'
 import { TextSkeleton } from '@/components/customs/custom-loader'
 import { CodeQuestion } from '../../../components/code/question'
 import { ScrollArea } from '@/components/ui/scroll-area'
 import { CodeActions } from '@/components/code/actions'
 
 export default function Code() {
     const router = useRouter()
-    const { id } = router.query
+    const [isChatOpen, setIsChatOpen] = useState(true)
+    const [id, setId] = useState(router.query.id as string)
     const editorRef = useRef<{ getText: () => string } | null>(null)
     const [loading, setLoading] = useState(true)
     const [editorLanguage, setEditorLanguage] = useState<LanguageMode>(LanguageMode.Javascript)
@@ -75,8 +77,10 @@ export default function Code() {
     const { data: sessionData } = useSession()
 
     useEffect(() => {
-        const matchId = router.query.id as string
+        const encodedId = router.query.id as string
+        const matchId = decodeStr(encodedId)
         retrieveMatchDetails(matchId)
+        setId(matchId)
     }, [router.query.id, retry])
 
     useEffect(() => {
@@ -130,6 +134,7 @@ export default function Code() {
         socketRef.current.on('disconnect', () => {
             if (!isViewOnly) {
                 router.push('/')
+                toast.info('The session has ended')
             }
         })
 
@@ -191,7 +196,7 @@ export default function Code() {
 
     function handleEndSessionConfirmation() {
         if (socketRef.current) {
-            socketRef.current?.emit('end-session')
+            socketRef.current.emit('end-session')
             router.push('/')
         }
         setIsDialogOpen(false)

frontend/pages/questions/index.tsx

@@ -158,10 +158,8 @@ export default function Questions() {
         } else if (modificationType === Modification.DELETE) {
             if (!questionData.id) return
             try {
-                const res = await deleteQuestionById(questionData.id)
-                if (res) {
-                    toast.success('Question deleted successfully')
-                }
+                await deleteQuestionById(questionData.id)
+                toast.success('Question deleted successfully')
             } catch (error) {
                 toast.error('Failed to delete question' + error)
                 return

frontend/pages/questions/props.tsx

@@ -15,12 +15,10 @@ const getColumns = (isAdmin: boolean): IDatatableColumn[] => {
         },
         {
             key: 'title',
-            width: '30%',
             offAutoCapitalize: true,
         },
         {
             key: 'categories',
-            width: '40%',
             formatter: (values) => {
                 const c = values.map((v: string) => (
                     <CustomLabel
@@ -72,7 +70,6 @@ const getColumns = (isAdmin: boolean): IDatatableColumn[] => {
         },
         {
             key: 'complexity',
-            width: '10%',
             isSortable: true,
             formatter: (value) => {
                 return <DifficultyLabel complexity={value} />

frontend/pages/sessions/columns.tsx

@@ -3,6 +3,7 @@ import { DifficultyLabel } from '@/components/customs/difficulty-label'
 import { Button } from '@/components/ui/button'
 import CustomLabel from '@/components/ui/label'
 import { IDatatableColumn, IRowData } from '@/types'
+import { encodeStr } from '@/util/encryption'
 import { capitalizeFirstLowerRest } from '@/util/string-modification'
 import { EyeIcon } from 'lucide-react'
 import { NextRouter } from 'next/router'
@@ -77,7 +78,8 @@ export const columns: IDatatableColumn[] = [
                             variant="iconNoBorder"
                             size="icon"
                             onClick={() => {
-                                router.push(`/code/${elem._id}`)
+                                const encoded = encodeStr(elem._id)
+                                router.push(`/code/${encoded}`)
                             }}
                         >
                             {elem.isCompleted ? <EyeIcon /> : <PlayIcon />}

frontend/pages/sessions/index.tsx

@@ -11,6 +11,7 @@ import ConfirmDialog, { ConfirmDialogProps } from '@/components/customs/confirm-
 import { getOngoingMatch } from '@/services/matching-service-api'
 import { useRouter } from 'next/router'
 import { TableSkeleton } from '@/components/customs/custom-loader'
+import { encodeStr } from '@/util/encryption'
 
 export default function Sessions() {
     const router = useRouter()
@@ -113,7 +114,8 @@ export default function Sessions() {
         if (!session?.user?.id) return
         const matchData = await getOngoingMatch(session.user.id)
         if (matchData) {
-            router.push(`/code/${matchData.id}`)
+            const encodedId = encodeStr(matchData.id)
+            router.push(`/code/${encodedId}`)
         } else {
             setDialog((prev) => ({ ...prev, dialogData: { ...prev.dialogData, isOpen: true } }))
         }

frontend/util/encryption.ts

@@ -0,0 +1,8 @@
+export const encodeStr = (str: string) => {
+    return btoa(str)
+}
+
+export const decodeStr = (encoded: string) => {
+    if (!encoded) return ''
+    return atob(encoded)
+}