From 3efaf16c843a39d9fb174652d43a2c00be701a6c Mon Sep 17 00:00:00 2001
From: Lucas Santana <lucasrcsantana@MacBook-Air-de-Lucas-3.local>
Date: Thu, 19 Dec 2024 18:49:12 -0300
Subject: [PATCH] Fluxos diversos

---
 src/main.tsx          |  2 +-
 src/types/database.ts | 21 ++++++++++++++-------
 tsconfig.json         |  6 +-----
 vite.config.ts        |  6 ++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main.tsx b/src/main.tsx
index 121c661..a8ef92d 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -1,7 +1,7 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import { RouterProvider } from 'react-router-dom';
-import { router } from '@/routes';
+import { router } from './routes';
 import './index.css';
 
 createRoot(document.getElementById('root')!).render(
diff --git a/src/types/database.ts b/src/types/database.ts
index 6a0db36..06ab889 100644
--- a/src/types/database.ts
+++ b/src/types/database.ts
@@ -67,11 +67,24 @@ export interface ClassWithStudents extends Class {
   students: Student[];
 }
 
-export interface SchoolWithRelations extends School {
+// Interface base para School com relações
+interface BaseSchoolWithRelations extends School {
   teachers: Teacher[];
+}
+
+// Interface específica para School com Classes e Students
+export interface SchoolWithClasses extends BaseSchoolWithRelations {
   classes: ClassWithStudents[];
 }
 
+// Interface específica para School com Classes, Students e Stories
+export interface SchoolWithClassesAndStories extends BaseSchoolWithRelations {
+  classes: ClassWithStudentsAndStories[];
+}
+
+// Removendo a interface duplicada e usando as novas interfaces específicas
+export type SchoolWithRelations = SchoolWithClasses | SchoolWithClassesAndStories;
+
 export interface StoryPage {
   text: string;
   image?: string;
@@ -101,10 +114,4 @@ export interface StudentWithStories extends Student {
 // Atualizando ClassWithStudents para incluir histórias dos alunos
 export interface ClassWithStudentsAndStories extends Class {
   students: StudentWithStories[];
-}
-
-// Atualizando SchoolWithRelations
-export interface SchoolWithRelations extends School {
-  teachers: Teacher[];
-  classes: ClassWithStudentsAndStories[];
 } 
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 9400a8e..8ebe2e0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,11 +13,7 @@
     "strict": true,
     "noUnusedLocals": false,
     "noUnusedParameters": false,
-    "noFallthroughCasesInSwitch": true,
-    "baseUrl": ".",
-    "paths": {
-      "@/*": ["src/*"]
-    }
+    "noFallthroughCasesInSwitch": true
   },
   "include": ["src"]
 }
diff --git a/vite.config.ts b/vite.config.ts
index 1f9f91a..0105aae 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -21,9 +21,7 @@ export default defineConfig({
   },
   resolve: {
     alias: {
-      'node-fetch': 'isomorphic-fetch',
-      '@': path.resolve(__dirname, './src')
-    },
-    extensions: ['.js', '.jsx', '.ts', '.tsx']
+      'node-fetch': 'isomorphic-fetch'
+    }
   }
 });