diff --git a/src/components/AgendarConsulta/style/styleTabelas/tabeladia.css b/src/components/AgendarConsulta/style/styleTabelas/tabeladia.css
index a242ba06..3a1dc164 100644
--- a/src/components/AgendarConsulta/style/styleTabelas/tabeladia.css
+++ b/src/components/AgendarConsulta/style/styleTabelas/tabeladia.css
@@ -52,17 +52,7 @@ font-weight: 600;
 }
 
 /* Ajuste para a classe calendario, se for usada */
-/*
-.calendario {
-  margin-top: 20px;
-  border-collapse: collapse;
-  width: 100%;
-  border-radius: 10px;
-  overflow: hidden;
-  box-shadow: 0 4px 12px rgb(255, 255, 255);
-  border: 10px solid #ffffffc5;
-  background-color: rgb(253, 253, 253);
-}*/
+
 
 
 .mostrar-horario td, .mostrar-horario th {
diff --git a/src/components/ProfileCard.js b/src/components/ProfileCard.js
index 7a5b181a..64b88b2c 100644
--- a/src/components/ProfileCard.js
+++ b/src/components/ProfileCard.js
@@ -1,4 +1,4 @@
-/*import React from 'react';
+import React from 'react';
 
 function ProfileCard() {
   return (
@@ -18,4 +18,4 @@ function ProfileCard() {
   );
 }
 
-export default ProfileCard;*/
\ No newline at end of file
+export default ProfileCard;
\ No newline at end of file
diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
index ecc49fd6..e1cc85ad 100644
--- a/src/components/Sidebar.jsx
+++ b/src/components/Sidebar.jsx
@@ -1,6 +1,8 @@
 import React, { useState } from "react";
 import { Link } from "react-router-dom";
 import menuItems from "../data/sidebar-items-medico.json"; // Use "sidebar-items-secretaria.json" para secretaria e "sidebar-items-adm.json" para ADM
+import TrocardePerfis from "./TrocardePerfis"; 
+
 
 // 1. Recebe 'menuItems' e 'onLogout' como props
 function Sidebar({ menuItems, onLogout }) { 
@@ -120,6 +122,8 @@ function Sidebar({ menuItems, onLogout }) {
                 </button>
             </li>
 
+            <TrocardePerfis />
+
      </ul>
     </div>
         
diff --git a/src/components/patients/PatientForm.jsx b/src/components/patients/PatientForm.jsx
index 1e76f572..fc76e97e 100644
--- a/src/components/patients/PatientForm.jsx
+++ b/src/components/patients/PatientForm.jsx
@@ -105,7 +105,6 @@ function PatientForm({ onSave, onCancel, formData, setFormData }) {
 
   const handleSubmit = async () => {
     if (!formData.full_name || !formData.cpf || !formData.sex || !formData.birth_date){
-      console.log(formData.full_name, formData.cpf, formData.sex, formData.birth_date)
       setErrorModalMsg('Por favor, preencha Nome, CPF, Gênero e data de nascimento.');
       setShowModal404(true); 
       return
diff --git a/src/pages/DoctorEditPage.jsx b/src/pages/DoctorEditPage.jsx
index 41cff758..fd934a73 100644
--- a/src/pages/DoctorEditPage.jsx
+++ b/src/pages/DoctorEditPage.jsx
@@ -5,7 +5,7 @@ import { useAuth } from '../components/utils/AuthProvider'
 import {useEffect, useState} from 'react'
 import { useParams } from 'react-router-dom'
 import API_KEY from '../components/utils/apiKeys'
-const DoctorEditPage = ( {id, setCurrentPage}) => {
+const DoctorEditPage = () => {
   const {getAuthorizationHeader, isAuthenticated} = useAuth();
   const [DoctorToPUT, setDoctorPUT] = useState({})
   
diff --git a/src/pages/DoctorTable.jsx b/src/pages/DoctorTable.jsx
index 54ae437d..16b49f66 100644
--- a/src/pages/DoctorTable.jsx
+++ b/src/pages/DoctorTable.jsx
@@ -163,7 +163,7 @@ function TableDoctor({ setCurrentPage, setPatientID }) {
                             <td>
                               <div className="d-flex gap-2">
                                 {/* Ver Detalhes */}
-                                <Link to={`/medicos/${medico.id}`}>
+                                <Link to={`${medico.id}`}>
                                   <button
                                     className="btn btn-sm"
                                     style={{
@@ -181,7 +181,7 @@ function TableDoctor({ setCurrentPage, setPatientID }) {
                                 </Link>
 
                                 {/*  Editar */}
-                                <Link to={`/medicos/${medico.id}/edit`}>
+                                <Link to={`${medico.id}/edit`}>
                                     <button
                                       className="btn btn-sm"
                                       style={{
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index c7864382..cad0c2ff 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -1,9 +1,11 @@
 import React, { useState, useEffect, use } from 'react';
-import { Link, useNavigate } from "react-router-dom";
+import {Link, useNavigate } from "react-router-dom";
 import { useAuth } from '../components/utils/AuthProvider';   
 import API_KEY from '../components/utils/apiKeys';
+import { UserInfos } from '../components/utils/Functions-Endpoints/General';
+
 function Login({ onEnterSystem }) {
-    const { authTokens, setAuthTokens } = useAuth();
+    const {setAuthTokens } = useAuth();
     const navigate = useNavigate();
     const [form, setForm] = useState({
         username: "",
@@ -11,15 +13,16 @@ function Login({ onEnterSystem }) {
     });
     const [alert, setAlert] = useState("");
     const [showPassword, setShowPassword] = useState(false);
-
-    useEffect(() => {
+/*
+    useEffect(async () => {
+        
       var myHeaders = new Headers();
             myHeaders.append("apikey", API_KEY);
             myHeaders.append("Content-Type", "application/json");
             
             var raw = JSON.stringify({
-            "email": "riseup@popcode.com.br",
-            "password": "riseup"
+            "email": form.username,
+            "password": form.password
             });
             
             var requestOptions = {
@@ -29,15 +32,53 @@ function Login({ onEnterSystem }) {
             
             redirect: 'follow'
             };
-            
-            fetch("https://yuanqfswhberkoevtmfr.supabase.co/auth/v1/token?grant_type=password", requestOptions)
+
+            const response = await fetch("https://yuanqfswhberkoevtmfr.supabase.co/auth/v1/token?grant_type=password", requestOptions);
+            const data = await response.json();
+            setAuthTokens(data);
+            console.log(data);
+
+        if(data.access_token){
+            console.log('jasja')
+            /*var myHeaders = new Headers();
+            myHeaders.append("Authorization", `Bearer ${data.access_token}`);
+            myHeaders.append("apikey", API_KEY);
+
+            var raw = JSON.stringify({
+            "email": "secretaria@squad23.com",
+            "password": "squad23!",
+            "full_name": "Secretaria",
+            "phone": "(11) 99999-9999",
+            "role": "secretaria"
+            });
+
+            var requestOptions = {
+            method: 'POST',
+            headers: myHeaders,
+            body: raw,
+            redirect: 'follow'
+            };
+
+            fetch("https://yuanqfswhberkoevtmfr.supabase.co/functions/v1/create-user", requestOptions)
             .then(response => response.json())
-            .then(data => {
-                setAuthTokens(data);
-                console.log(data);
-            })
+            .then(result => console.log(result))
+            .catch(error => console.log('error', error));*/
+
+            /* var myHeaders = new Headers();
+            myHeaders.append("Authorization", `Bearer ${data.access_token}`);
+            myHeaders.append("apikey", API_KEY);
+            var requestOptions = {
+            method: 'GET',
+            headers: myHeaders,
+            redirect: 'follow'
+            };
+
+            fetch("https://yuanqfswhberkoevtmfr.supabase.co/rest/v1/user_roles", requestOptions)
+            .then(response => response.text())
+            .then(result => console.log(result))
             .catch(error => console.log('error', error));
-    }, []);
+        }
+    }, []);*/
 
     const handleChange = (e) => {
         setForm({ ...form, [e.target.name]: e.target.value });
@@ -47,30 +88,37 @@ function Login({ onEnterSystem }) {
         e.preventDefault();
         console.log("Tentando logar com:", form);
         if (form.username && form.password) {
-
-          
-           /* if (data.access_token) {
-                console.log("Login bem-sucedido!");
-                var myHeaders = new Headers();
+             var myHeaders = new Headers();
             myHeaders.append("apikey", API_KEY);
-            myHeaders.append("Authorization", `Bearer ${data.access_token}`);
-
+            myHeaders.append("Content-Type", "application/json");
+            
+            var raw = JSON.stringify({
+            "email": form.username,
+            "password": form.password
+            });
+            
             var requestOptions = {
-            method: 'GET',
+            method: 'POST',
             headers: myHeaders,
+            body: raw,
+            
             redirect: 'follow'
             };
 
-            console.log(data.user.id)
+            const response = await fetch("https://yuanqfswhberkoevtmfr.supabase.co/auth/v1/token?grant_type=password", requestOptions);
+            const data = await response.json();
+            setAuthTokens(data);
+            console.log(data);
 
-            fetch(`https://yuanqfswhberkoevtmfr.supabase.co/functions/v1/user-info`, requestOptions)
-            .then(response => response.text())
-            .then(result => console.log(result, "vamo ver se da certo"))
-            .catch(error => console.log('error', error));
-            }*/
+          
+            if (data.access_token){
+             
 
-            navigate(`/${form.username}/`);
+               const UserData = await UserInfos(`bearer ${data.access_token}`);
+               console.log(UserData, 'Dados do usuário');
 
+            navigate(`/admin/`);
+        }
 
         } else {
             setAlert("Preencha todos os campos!");
diff --git a/src/pages/PatientCadastroManager.jsx b/src/pages/PatientCadastroManager.jsx
index 926887f4..a321c849 100644
--- a/src/pages/PatientCadastroManager.jsx
+++ b/src/pages/PatientCadastroManager.jsx
@@ -6,7 +6,7 @@ import API_KEY from '../components/utils/apiKeys';
 import { useAuth } from '../components/utils/AuthProvider';
 
 
-function PatientCadastroManager( {setCurrentPage} ) {
+function PatientCadastroManager( {} ) {
   const navigate = useNavigate()
   const [showModal, setShowModal] = useState(false);
   const [infosModal, setInfosModal] = useState({title:'', message:''});
diff --git a/src/pages/TablePaciente.jsx b/src/pages/TablePaciente.jsx
index 50c06ff5..5f6037d5 100644
--- a/src/pages/TablePaciente.jsx
+++ b/src/pages/TablePaciente.jsx
@@ -115,7 +115,7 @@ function TablePaciente({ setCurrentPage, setPatientID }) {
 
   fetch("https://yuanqfswhberkoevtmfr.supabase.co/rest/v1/patients", requestOptions)
     .then(response => response.json())
-    .then(result => setPacientes(result))
+    .then(result => console.log(result))
     .catch(error => console.log('error', error));
   }, [isAuthenticated, getAuthorizationHeader]);
 
@@ -265,7 +265,7 @@ function TablePaciente({ setCurrentPage, setPatientID }) {
                             </td>
                             <td>
                               <div className="d-flex gap-2">
-                                <Link to={`/pacientes/${paciente.id}`}>
+                                <Link to={`${paciente.id}`}>
                                   <button
                                     className="btn btn-sm"
                                     style={{
@@ -281,7 +281,7 @@ function TablePaciente({ setCurrentPage, setPatientID }) {
                                   </button>
                                 </Link>
 
-                                <Link to={`/pacientes/${paciente.id}/edit`}>
+                                <Link to={`${paciente.id}/edit`}>
                                   <button
                                     className="btn btn-sm"
                                     style={{