Skip to content

Jp changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpsl00 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Jp changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ab506a
Update subject.tsx
jpsl00 Feb 11, 2025
2aadd7a
Update schools.tsx
jpsl00 Feb 11, 2025
d45cbe9
Merge pull request #1 from Challenge-1FSDT/jp-changes-1
jpsl00 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions src/pages/schools.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,20 @@ export default function Schools() {
const [loading, setLoading] = useState(true);
const router = useRouter();

useEffect(() => {
useEffect(async () => {
if (!api.AuthService.isAuthenticated()) {
router.push("/");
return;
}

api.SchoolService.getSchools()
.then((data) => {
const allSchools = data.data;

setSchools(allSchools);
setLoading(false);
})
.catch((error) => {
console.error("Erro ao buscar escolas:", error);
setLoading(false);
});
try {
const { data } = await api.SchoolService.getSchools()
setSchools(data);
} catch(error) {
console.error("Erro ao buscar escolas:", error);
} finally {
setLoading(false);
}
}, [router]);

const handleSelectSchool = (schoolId: string) => {
Expand Down
19 changes: 9 additions & 10 deletions src/pages/subject.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default function Subject() {
const [loading, setLoading] = useState(true);
const [subject, setSubject] = useState<{ id: string; name: string } | null>(null);

useEffect(() => {
useEffect(async () => {
if (!api.AuthService.isAuthenticated()) {
router.push("/");
return;
Expand All @@ -24,15 +24,14 @@ export default function Subject() {
return;
}

api.SubjectService.getSubject(selectedSubject)
.then((data) => {
setSubject(data.data);
setLoading(false);
})
.catch((error) => {
console.error("Erro ao buscar disciplina:", error);
setLoading(false);
});
try {
const { data } = await api.SubjectService.getSubject(selectedSubject)
setSubject(data.data);
} catch(error) {
console.error("Erro ao buscar disciplina:", error);
} finally {
setLoading(false);
}
}, [router]);

return (
Expand Down