fix(#149): adding fix to reability and manutenability

Co-authored-by: DaviMatheus <[email protected]>
fga-eps-mds · Sep 8, 2024 · ad4249d · ad4249d
1 parent b937e41
commit ad4249d
Show file tree

Hide file tree

Showing 40 changed files with 325 additions and 378 deletions.
diff --git a/src/app/(auth)/oauth/page.tsx b/src/app/(auth)/oauth/page.tsx
@@ -1,33 +1,14 @@
 'use client';
 
-import { signIn, useSession } from 'next-auth/react';
-import { useRouter } from 'next/navigation';
-import { useEffect, useState } from 'react';
-import { useSearchParams } from 'next/navigation';
-import { Suspense } from 'react';
+import { signIn } from 'next-auth/react';
+import { useRouter, useSearchParams } from 'next/navigation';
+import { useEffect, useState, Suspense } from 'react';
 import { toast } from 'sonner';
-import { useMutation } from '@tanstack/react-query';
 import loadImage from '@/public/loading.gif';
 import { CircularProgress } from '@mui/material';
 
-const signInWithToken = async ({
-  token,
-  refresh,
-}: {
-  token: string;
-  refresh: string;
-}) => {
-  const result = await signIn('credentials', {
-    token,
-    refresh,
-    redirect: false,
-  });
-};
-
 const OAuthContent = () => {
   const router = useRouter();
-  const { data: session } = useSession();
-  const [message, setMessage] = useState('Carregando...');
   const searchParams = useSearchParams();
   const token = searchParams.get('token');
   const refresh = searchParams.get('refresh');
@@ -45,7 +26,7 @@ const OAuthContent = () => {
         toast.error('Erro ao efetuar login, por favor tente novamente!');
         router.push('/login');
       }
-
+      setIsPending(false);
       localStorage.setItem('token', JSON.stringify(token));
       localStorage.setItem('refresh', JSON.stringify(refresh));
       router.push('/home');
@@ -60,7 +41,7 @@ const OAuthContent = () => {
 
   return (
     <div className="flex justify-center items-center h-screen">
-      {isPending ? <CircularProgress /> : message}
+      {isPending ? <CircularProgress /> : 'Carregando...'}
     </div>
   );
 };

diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
@@ -11,7 +11,6 @@ import {
   DialogActions,
   DialogContent,
   DialogTitle,
-  Button,
   Typography,
 } from '@mui/material';
 
@@ -90,7 +89,7 @@ const Admin: React.FC = () => {
     if (selectedUser && selectedRole) {
       try {
         const token = JSON.parse(localStorage.getItem('token')!);
-        await updateUserRole(selectedUser._id, selectedRole,token);
+        await updateUserRole(selectedUser._id, selectedRole, token);
         const updatedUsers = users.map((user) =>
           user._id === selectedUser._id
             ? { ...user, role: selectedRole }

diff --git a/src/app/forgot-password/page.tsx b/src/app/forgot-password/page.tsx
@@ -2,7 +2,7 @@
 
 import Image from 'next/image';
 import MyButton from '@/components/ui/buttons/myButton.component';
-import { Box, TextField, Button } from '@mui/material';
+import { Box, TextField } from '@mui/material';
 import { useMutation } from '@tanstack/react-query';
 import calcuclusLogo from '@/public/calculus-logo.svg';
 import { forgotPassword } from '@/services/user.service';
@@ -25,15 +25,15 @@ export default function ForgotPassword() {
     resolver: zodResolver(forgotPasswordSchema),
   });
 
-  const { mutate, isPending } = useMutation({
+  const { mutate } = useMutation({
     mutationFn: async (data: ForgotPasswordData) => await forgotPassword(data),
-    onSuccess: (data) => {
+    onSuccess: () => {
       toast.success(
         'Email enviado com sucesso! Verifique sua caixa de entrada para obter as instruções.',
       );
       router.push('/');
     },
-    onError: (error) => {
+    onError: () => {
       toast.error(
         'Ocorreu um erro ao enviar o email. Tente novamente mais tarde.',
       );

diff --git a/src/app/home/page.tsx b/src/app/home/page.tsx
@@ -1,11 +1,6 @@
-'use client';
-
-import { useSession } from 'next-auth/react';
 import HomePrincipalPage from '@/components/home/homePage';
 
 export default function HomePage() {
-  const { data: session } = useSession();
-
   return (
     <div className="bg-[#F1F1F1] min-h-screen">
       <div className="bg-[#F1F1F1] max-w-7xl mx-auto pt-14 px-5">

diff --git a/src/app/journey-page/[journeyId]/page.tsx b/src/app/journey-page/[journeyId]/page.tsx
@@ -1,20 +1,31 @@
 'use client';
 
 import React, { useEffect, useState } from 'react';
-import { Box, CircularProgress, Divider, IconButton, Typography } from '@mui/material';
+import {
+  Box,
+  CircularProgress,
+  Divider,
+  IconButton,
+  Typography,
+} from '@mui/material';
 import JourneyInfo from '@/components/journey/journeyInfo';
 import JourneyPath from '@/components/journey/journeyPath';
-import { getJourney, getJourneysByPoint, getTrails } from '@/services/studioMaker.service';
+import {
+  getJourney,
+  getJourneysByPoint,
+  getTrails,
+} from '@/services/studioMaker.service';
 import { Journey } from '@/lib/interfaces/journey.interface';
 import { Trail } from '@/lib/interfaces/trails.interface';
 import { useParams, useRouter } from 'next/navigation';
-import { getSubscribedJourneys, } from '@/services/user.service';
+import {
+  getSubscribedJourneys,
+  getCompletedTrails,
+} from '@/services/user.service';
 import { useSession } from 'next-auth/react';
-import { getCompletedTrails } from '@/services/user.service';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
 
-
 export default function JourneyPage() {
   const { journeyId } = useParams();
   const router = useRouter();
@@ -56,13 +67,17 @@ export default function JourneyPage() {
         const pointId = journeyData.point;
         if (pointId) {
           const relatedJourneys: Journey[] = await getJourneysByPoint(pointId);
-          const next = relatedJourneys.find(j => j.order === journeyData.order + 1);
+          const next = relatedJourneys.find(
+            (j) => j.order === journeyData.order + 1,
+          );
           if (next != undefined) {
             setNextJourney(next);
             console.log(next);
             console.log(nextJourney);
           }
-          const previous = relatedJourneys.find(j => j.order === journeyData.order - 1);
+          const previous = relatedJourneys.find(
+            (j) => j.order === journeyData.order - 1,
+          );
           if (previous != undefined) {
             setPreviousJourney(previous);
             console.log(previous);
@@ -90,11 +105,11 @@ export default function JourneyPage() {
 
   const handleNext = async () => {
     router.push(`/journey-page/${nextJourney?._id}`);
-  }
+  };
 
   const handlePrevious = async () => {
     router.push(`/journey-page/${previousJourney?._id}`);
-  }
+  };
 
   if (error) {
     return <div>{error}</div>;
@@ -109,45 +124,53 @@ export default function JourneyPage() {
   );
 
   return (
-    <Box sx={{
-      backgroundColor: '#f1f1f1',
-      height: '100vh',
-      position: 'relative',
-    }}>
-      {(previousJourney) &&
-        <IconButton onClick={handlePrevious} sx={{
-          position: 'absolute',  
-          top: '10%',            
-          left: '5%',          
-          backgroundColor: '#FF4122',
-          height: '40px',
-          width: '40px',
-          borderRadius: '40px',
-          color: '#f1f1f1',
-          transform: 'translateY(-50%)',  
-          zIndex: 2,
-        }}>
+    <Box
+      sx={{
+        backgroundColor: '#f1f1f1',
+        height: '100vh',
+        position: 'relative',
+      }}
+    >
+      {previousJourney && (
+        <IconButton
+          onClick={handlePrevious}
+          sx={{
+            position: 'absolute',
+            top: '10%',
+            left: '5%',
+            backgroundColor: '#FF4122',
+            height: '40px',
+            width: '40px',
+            borderRadius: '40px',
+            color: '#f1f1f1',
+            transform: 'translateY(-50%)',
+            zIndex: 2,
+          }}
+        >
           <ArrowBackIcon />
         </IconButton>
-      }
-
-      {(nextJourney) &&
-        <IconButton onClick={handleNext} sx={{
-          position: 'absolute',  
-          top: '10%',            
-          right: '5%',         
-          backgroundColor: '#FF4122',
-          height: '40px',
-          width: '40px',
-          borderRadius: '40px',
-          color: '#f1f1f1',
-          transform: 'translateY(-50%)',  
-          zIndex: 2,
-        }}>
+      )}
+
+      {nextJourney && (
+        <IconButton
+          onClick={handleNext}
+          sx={{
+            position: 'absolute',
+            top: '10%',
+            right: '5%',
+            backgroundColor: '#FF4122',
+            height: '40px',
+            width: '40px',
+            borderRadius: '40px',
+            color: '#f1f1f1',
+            transform: 'translateY(-50%)',
+            zIndex: 2,
+          }}
+        >
           <ArrowForwardIcon />
         </IconButton>
-      }
-    
+      )}
+
       <Box
         sx={{
           display: 'flex',
@@ -168,14 +191,14 @@ export default function JourneyPage() {
             completedTrailsCount={completedTrailsInJourney.length}
           />
         </Box>
-    
+
         <Divider
           sx={{ marginBottom: '100px', marginTop: '100px' }}
           orientation="vertical"
           variant="middle"
           flexItem
         />
-    
+
         {!trails.length ? (
           <Typography
             variant="h3"
@@ -188,9 +211,11 @@ export default function JourneyPage() {
             Ainda não há trilhas nessa jornada
           </Typography>
         ) : (
-          <React.Fragment>
-            <JourneyPath trails={trails} journeyId={journey._id} hasJourney={hasJourney} />
-          </React.Fragment>
+          <JourneyPath
+            trails={trails}
+            journeyId={journey._id}
+            hasJourney={hasJourney}
+          />
         )}
       </Box>
     </Box>

diff --git a/src/app/journey/[...pointId]/page.tsx b/src/app/journey/[...pointId]/page.tsx
@@ -27,7 +27,7 @@ import { toast } from 'sonner';
 export default function JourneyPage({
   params,
 }: {
-  params: { pointId: string };
+  readonly params: { pointId: string };
 }) {
   const fetchJourneys = async (): Promise<Journey[]> => {
     let journeys = await getJourneysByPoint(params.pointId);
@@ -85,8 +85,6 @@ export default function JourneyPage({
 
   const handleJourneyAction = (action: string) => {
     if (action === 'editar') setEditionDialogOpen(true);
-    if (action === 'gerenciar') {
-    }
     if (action === 'excluir') setExclusionDialogOpen(true);
   };
 
@@ -116,20 +114,12 @@ export default function JourneyPage({
     }
   };
 
-  const handleCloseCreateDialog = () => {
-    setCreateDialogOpen(false);
-  };
-
   if (isLoading) {
     return <CircularProgress />;
   }
 
   if (error) {
-    return (
-      <Typography>
-        Error fetching journeys: {(error as Error).message}
-      </Typography>
-    );
+    return <Typography>Error fetching journeys</Typography>;
   }
 
   return (

diff --git a/src/app/register/page.tsx b/src/app/register/page.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Box, Typography, IconButton, Link, Grid } from '@mui/material';
+import { Box, Typography, Link, Grid } from '@mui/material';
 import Image from 'next/image';
 import maoCerebro from '@/public/mao_cerebro.png';
 import { SingUpForm } from '@/components/forms/signUpForm';

diff --git a/src/app/reset-password/page.tsx b/src/app/reset-password/page.tsx
@@ -5,26 +5,19 @@ import { Box, TextField, IconButton, InputAdornment } from '@mui/material';
 import { Visibility, VisibilityOff } from '@mui/icons-material';
 import MyButton from '@/components/ui/buttons/myButton.component';
 import calculusLogos from '@/public/calculus-logo.svg';
-import { useSearchParams } from 'next/navigation';
+import { useSearchParams, useRouter } from 'next/navigation';
 import {
   ResetPasswordData,
   resetPasswordSchema,
 } from '@/lib/schemas/password.schema';
 import { useForm, SubmitHandler } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useRouter } from 'next/navigation';
 import { resetPassword } from '@/services/user.service';
 import { useMutation } from '@tanstack/react-query';
 import { toast } from 'sonner';
 import { useState, Suspense } from 'react';
 
 export default function ResetPassword() {
-  const SearchParamsComponent = () => {
-    const searchParams = useSearchParams();
-    const token = searchParams.get('token');
-    return { token };
-  };
-
   return (
     <Suspense fallback={<div>Loading...</div>}>
       <SearchParamsComponentWrapper />
@@ -47,7 +40,7 @@ function SearchParamsComponentWrapper() {
     resolver: zodResolver(resetPasswordSchema),
   });
 
-  const { mutate, isPending } = useMutation({
+  const { mutate } = useMutation({
     mutationFn: async (data: any) => await resetPassword(data),
     onSuccess: (data) => {
       toast.success('Senha alterada com sucesso');