RiseUP/riseup-squad21
5
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: RiseUP:9f4366963f9e082098b8e9796a8044d1923697cf
Branches Tags
RiseUP:main
RiseUP:responsividade-nova
RiseUP:user2
RiseUP:refatoracao
RiseUP:refatoracao-ui
RiseUP:refatoracao-manager
RiseUP:disponibilidade
RiseUP:Users
RiseUP:laudo-API
RiseUP:feat/refatorar-login
RiseUP:consultas-página-médico
RiseUP:acessibilidade
RiseUP:lista-de-pacientes-j2
RiseUP:sec-marca
...
compare: RiseUP:6dd4a8c130dd5fad7f9f9cb1d778caa8e42b6a4b
Branches Tags
RiseUP:main
RiseUP:responsividade-nova
RiseUP:user2
RiseUP:refatoracao
RiseUP:refatoracao-ui
RiseUP:refatoracao-manager
RiseUP:disponibilidade
RiseUP:Users
RiseUP:laudo-API
RiseUP:feat/refatorar-login
RiseUP:consultas-página-médico
RiseUP:acessibilidade
RiseUP:lista-de-pacientes-j2
RiseUP:sec-marca

4 Commits
9f4366963f ... 6dd4a8c130

Author SHA1 Message Date
m1guelmcf
6dd4a8c130 Merge pull request 'main' (#1) from StsDanilo/riseup-squad21:main into main 
Reviewed-on: #1
 2025-09-23 11:50:01 +00:00
StsDanilo
11fa3ee260 merge upstream 2025-09-23 11:41:17 +00:00
StsDanilo
423e0bb935 Merge pull request 'sidebar fixada' (#1) from sidebar-fixada into main 
Reviewed-on: StsDanilo/riseup-squad21#1
 2025-09-22 11:46:59 +00:00
DaniloSts
7ebec734da sidebar fixada 2025-09-22 08:37:44 -03:00
3 changed files with 12 additions and 16 deletions
Show Stats Expand all files Collapse all files

8
components/doctor-layout.tsx
View File

@ -92,7 +92,7 @@ export default function DoctorLayout({ children }: PatientLayoutProps) {
return (
<div className="min-h-screen bg-gray-50 flex">
{/* Sidebar */}
<div className={`bg-white border-r border-gray-200 transition-all duration-300 ${sidebarCollapsed ? "w-16" : "w-64"} h-screen flex flex-col`}>
<div className={`bg-white border-r border-gray-200 transition-all duration-300 ${sidebarCollapsed ? "w-16" : "w-64"} fixed left-0 top-0 h-screen flex flex-col z-10`}>
<div className="p-4 border-b border-gray-200">
<div className="flex items-center justify-between">
{!sidebarCollapsed && (
@ -109,7 +109,7 @@ export default function DoctorLayout({ children }: PatientLayoutProps) {
</div>
</div>
<nav className="flex-1 p-2">
<nav className="flex-1 p-2 overflow-y-auto">
{menuItems.map((item) => {
const Icon = item.icon;
const isActive = pathname === item.href || (item.href !== "/" && pathname.startsWith(item.href));
@ -125,7 +125,7 @@ export default function DoctorLayout({ children }: PatientLayoutProps) {
})}
</nav>
<div className="border-t p-4">
<div className="border-t p-4 mt-auto">
<div className="flex items-center space-x-3 mb-4">
<Avatar>
<AvatarImage src="/placeholder.svg?height=40&width=40" />
@ -149,7 +149,7 @@ export default function DoctorLayout({ children }: PatientLayoutProps) {
</div>
{/* Main Content */}
<div className="flex-1 flex flex-col">
<div className={`flex-1 flex flex-col transition-all duration-300 ${sidebarCollapsed ? "ml-16" : "ml-64"}`}>
{/* Header */}
<header className="bg-white border-b border-gray-200 px-6 py-4">
<div className="flex items-center justify-between">

10
components/patient-layout.tsx
View File

@ -113,9 +113,7 @@ export default function HospitalLayout({ children }: HospitalLayoutProps) {
return (
<div className="min-h-screen bg-gray-50 flex">
{/* Sidebar */}
<div
className={`bg-white border-r border-gray-200 transition-all duration-300 ${sidebarCollapsed ? "w-16" : "w-64"} h-screen flex flex-col`}
>
<div className={`bg-white border-r border-gray-200 transition-all duration-300 ${sidebarCollapsed ? "w-16" : "w-64"} fixed left-0 top-0 h-screen flex flex-col z-10`}>
<div className="p-4 border-b border-gray-200">
<div className="flex items-center justify-between">
{!sidebarCollapsed && (
@ -132,7 +130,7 @@ export default function HospitalLayout({ children }: HospitalLayoutProps) {
</div>
</div>
<nav className="flex-1 p-2">
<nav className="flex-1 p-2 overflow-y-auto">
{menuItems.map((item) => {
const Icon = item.icon
const isActive = pathname === item.href || (item.href !== "/" && pathname.startsWith(item.href))
@ -152,7 +150,7 @@ export default function HospitalLayout({ children }: HospitalLayoutProps) {
})}
</nav>
<div className="border-t p-4">
<div className="border-t p-4 mt-auto">
<div className="flex items-center space-x-3 mb-4">
<Avatar>
<AvatarImage src="/placeholder.svg?height=40&width=40" />
@ -176,7 +174,7 @@ export default function HospitalLayout({ children }: HospitalLayoutProps) {
</div>
{/* Main Content */}
<div className="flex-1 flex flex-col">
<div className={`flex-1 flex flex-col transition-all duration-300 ${sidebarCollapsed ? "ml-16" : "ml-64"}`}>
{/* Header */}
<header className="bg-white border-b border-gray-200 px-6 py-4">
<div className="flex items-center justify-between">

10
components/secretary-layout.tsx
View File

@ -98,9 +98,7 @@ export default function SecretaryLayout({ children }: PatientLayoutProps) {
return (
<div className="min-h-screen bg-gray-50 flex">
{/* Sidebar */}
<div
className={`bg-white border-r border-gray-200 transition-all duration-300 ${sidebarCollapsed ? "w-16" : "w-64"} h-screen flex flex-col`}
>
<div className={`bg-white border-r border-gray-200 transition-all duration-300 ${sidebarCollapsed ? "w-16" : "w-64"} fixed left-0 top-0 h-screen flex flex-col z-10`}>
<div className="p-4 border-b border-gray-200">
<div className="flex items-center justify-between">
{!sidebarCollapsed && (
@ -117,7 +115,7 @@ export default function SecretaryLayout({ children }: PatientLayoutProps) {
</div>
</div>
<nav className="flex-1 p-2">
<nav className="flex-1 p-2 overflow-y-auto">
{menuItems.map((item) => {
const Icon = item.icon
const isActive = pathname === item.href || (item.href !== "/" && pathname.startsWith(item.href))
@ -137,7 +135,7 @@ export default function SecretaryLayout({ children }: PatientLayoutProps) {
})}
</nav>
<div className="border-t p-4">
<div className="border-t p-4 mt-auto">
<div className="flex items-center space-x-3 mb-4">
<Avatar>
<AvatarImage src="/placeholder.svg?height=40&width=40" />
@ -161,7 +159,7 @@ export default function SecretaryLayout({ children }: PatientLayoutProps) {
</div>
{/* Main Content */}
<div className="flex-1 flex flex-col">
<div className={`flex-1 flex flex-col transition-all duration-300 ${sidebarCollapsed ? "ml-16" : "ml-64"}`}>
{/* Header */}
<header className="bg-white border-b border-gray-200 px-6 py-4">
<div className="flex items-center justify-between">