RiseUP/riseup-squad20
1
0
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #83

Merged
M-Gabrielly merged 426 commits from develop into main 2025-12-04 04:13:15 +00:00
Conversation 0 Commits 426 Files Changed 170 +39 -31
6 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c1471ea4fa - Show all commits

6
susconecta/app/(main-routes)/dashboard/page.tsx
View File

@ -283,15 +283,15 @@ export default function DashboardPage() {
<Plus className="h-4 w-4" /> <Plus className="h-4 w-4" />
Novo Paciente Novo Paciente
</Button> </Button>
<Button onClick={() => router.push('/agenda')} variant="outline" className="gap-2 hover:bg-primary/10 hover:text-primary dark:hover:bg-accent dark:hover:text-accent-foreground"> <Button onClick={() => router.push('/agenda')} variant="outline" className="gap-2 hover:!bg-primary hover:!text-white transition-colors">
<Calendar className="h-4 w-4" /> <Calendar className="h-4 w-4" />
Novo Agendamento Novo Agendamento
</Button> </Button>
<Button onClick={() => setShowDoctorForm(true)} variant="outline" className="gap-2 hover:bg-primary/10 hover:text-primary dark:hover:bg-accent dark:hover:text-accent-foreground"> <Button onClick={() => setShowDoctorForm(true)} variant="outline" className="gap-2 hover:!bg-primary hover:!text-white transition-colors">
<Stethoscope className="h-4 w-4" /> <Stethoscope className="h-4 w-4" />
Novo Médico Novo Médico
</Button> </Button>
<Button onClick={() => router.push('/dashboard/relatorios')} variant="outline" className="gap-2 hover:bg-primary/10 hover:text-primary dark:hover:bg-accent dark:hover:text-accent-foreground"> <Button onClick={() => router.push('/dashboard/relatorios')} variant="outline" className="gap-2 hover:!bg-primary hover:!text-white transition-colors">
<FileText className="h-4 w-4" /> <FileText className="h-4 w-4" />
Ver Relatórios Ver Relatórios
</Button> </Button>

20
susconecta/app/paciente/page.tsx
View File

@ -982,7 +982,7 @@ export default function PacientePage() {
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<User className="h-6 w-6 text-primary" aria-hidden /> <User className="h-6 w-6 text-primary" aria-hidden />
<span className="font-bold">Portal do Paciente</span> <span className="font-bold">Portal do Paciente</span>
<Button asChild variant="outline" className="ml-4"> <Button asChild variant="outline" className="ml-4 hover:!bg-primary hover:!text-white hover:!border-primary transition-colors">
<Link href="/"> <Link href="/">
<Home className="h-4 w-4 mr-1" /> Início <Home className="h-4 w-4 mr-1" /> Início
</Link> </Link>
@ -990,7 +990,15 @@ export default function PacientePage() {
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<SimpleThemeToggle /> <SimpleThemeToggle />
<Button onClick={handleLogout} variant="destructive" aria-label={strings.sair} disabled={loading} className="ml-2"><LogOut className="h-4 w-4" /> {strings.sair}</Button> <Button
onClick={handleLogout}
variant="outline"
aria-label={strings.sair}
disabled={loading}
className="ml-2 bg-background hover:!bg-destructive hover:!text-white hover:!border-destructive transition-colors"
>
<LogOut className="h-4 w-4" /> {strings.sair}
</Button>
</div> </div>
</header> </header>
@ -1001,7 +1009,7 @@ export default function PacientePage() {
variant={tab==='dashboard'?'secondary':'ghost'} variant={tab==='dashboard'?'secondary':'ghost'}
aria-current={tab==='dashboard'} aria-current={tab==='dashboard'}
onClick={()=>setTab('dashboard')} onClick={()=>setTab('dashboard')}
className={`justify-start ${tab==='dashboard' ? 'bg-primary/10 text-primary' : ''}`} className={`justify-start hover:!bg-primary hover:!text-white transition-colors ${tab==='dashboard' ? 'bg-primary/10 text-primary' : ''}`}
> >
<Calendar className="mr-2 h-5 w-5" />{strings.dashboard} <Calendar className="mr-2 h-5 w-5" />{strings.dashboard}
</Button> </Button>
@ -1009,7 +1017,7 @@ export default function PacientePage() {
variant={tab==='consultas'?'secondary':'ghost'} variant={tab==='consultas'?'secondary':'ghost'}
aria-current={tab==='consultas'} aria-current={tab==='consultas'}
onClick={()=>setTab('consultas')} onClick={()=>setTab('consultas')}
className={`justify-start ${tab==='consultas' ? 'bg-primary/10 text-primary' : ''}`} className={`justify-start hover:!bg-primary hover:!text-white transition-colors ${tab==='consultas' ? 'bg-primary/10 text-primary' : ''}`}
> >
<Calendar className="mr-2 h-5 w-5" />{strings.consultas} <Calendar className="mr-2 h-5 w-5" />{strings.consultas}
</Button> </Button>
@ -1017,7 +1025,7 @@ export default function PacientePage() {
variant={tab==='exames'?'secondary':'ghost'} variant={tab==='exames'?'secondary':'ghost'}
aria-current={tab==='exames'} aria-current={tab==='exames'}
onClick={()=>setTab('exames')} onClick={()=>setTab('exames')}
className={`justify-start ${tab==='exames' ? 'bg-primary/10 text-primary' : ''}`} className={`justify-start hover:!bg-primary hover:!text-white transition-colors ${tab==='exames' ? 'bg-primary/10 text-primary' : ''}`}
> >
<FileText className="mr-2 h-5 w-5" />{strings.exames} <FileText className="mr-2 h-5 w-5" />{strings.exames}
</Button> </Button>
@ -1026,7 +1034,7 @@ export default function PacientePage() {
variant={tab==='perfil'?'secondary':'ghost'} variant={tab==='perfil'?'secondary':'ghost'}
aria-current={tab==='perfil'} aria-current={tab==='perfil'}
onClick={()=>setTab('perfil')} onClick={()=>setTab('perfil')}
className={`justify-start ${tab==='perfil' ? 'bg-primary/10 text-primary' : ''}`} className={`justify-start hover:!bg-primary hover:!text-white transition-colors ${tab==='perfil' ? 'bg-primary/10 text-primary' : ''}`}
> >
<UserCog className="mr-2 h-5 w-5" />{strings.perfil} <UserCog className="mr-2 h-5 w-5" />{strings.perfil}
</Button> </Button>

38
susconecta/app/profissional/page.tsx
View File

@ -690,9 +690,9 @@ const ProfissionalPage = () => {
variant="outline" variant="outline"
size="sm" size="sm"
onClick={() => navigateDate('prev')} onClick={() => navigateDate('prev')}
className="p-2 hover:bg-blue-50 cursor-pointer dark:hover:bg-primary dark:hover:text-primary-foreground" className="p-2 hover:!bg-primary hover:!text-white cursor-pointer transition-colors"
> >
<ChevronLeft className="h-4 w-4 hover:!text-white" /> <ChevronLeft className="h-4 w-4" />
</Button> </Button>
<h3 className="text-lg font-medium text-foreground"> <h3 className="text-lg font-medium text-foreground">
{formatDate(currentCalendarDate)} {formatDate(currentCalendarDate)}
@ -701,9 +701,9 @@ const ProfissionalPage = () => {
variant="outline" variant="outline"
size="sm" size="sm"
onClick={() => navigateDate('next')} onClick={() => navigateDate('next')}
className="p-2 hover:bg-blue-50 cursor-pointer dark:hover:bg-primary dark:hover:text-primary-foreground" className="p-2 hover:!bg-primary hover:!text-white cursor-pointer transition-colors"
> >
<ChevronRight className="h-4 w-4 hover:!text-white" /> <ChevronRight className="h-4 w-4" />
</Button> </Button>
</div> </div>
@ -900,7 +900,7 @@ const ProfissionalPage = () => {
variant={selectedRange === 'todos' ? 'default' : 'outline'} variant={selectedRange === 'todos' ? 'default' : 'outline'}
size="sm" size="sm"
onClick={() => setSelectedRange('todos')} onClick={() => setSelectedRange('todos')}
className="hover:bg-primary/10 hover:text-primary" className="hover:!bg-primary hover:!text-white transition-colors"
> >
Todos Todos
</Button> </Button>
@ -908,7 +908,7 @@ const ProfissionalPage = () => {
variant={selectedRange === 'semana' ? 'default' : 'outline'} variant={selectedRange === 'semana' ? 'default' : 'outline'}
size="sm" size="sm"
onClick={() => setSelectedRange('semana')} onClick={() => setSelectedRange('semana')}
className="hover:bg-primary/10 hover:text-primary" className="hover:!bg-primary hover:!text-white transition-colors"
> >
Semana Semana
</Button> </Button>
@ -916,7 +916,7 @@ const ProfissionalPage = () => {
variant={selectedRange === 'mes' ? 'default' : 'outline'} variant={selectedRange === 'mes' ? 'default' : 'outline'}
size="sm" size="sm"
onClick={() => setSelectedRange('mes')} onClick={() => setSelectedRange('mes')}
className="hover:bg-primary/10 hover:text-primary" className="hover:!bg-primary hover:!text-white transition-colors"
> >
Mês Mês
</Button> </Button>
@ -1077,7 +1077,7 @@ const ProfissionalPage = () => {
<Button size="sm" onClick={doSearch} disabled={searching}> <Button size="sm" onClick={doSearch} disabled={searching}>
Buscar Buscar
</Button> </Button>
<Button size="sm" variant="ghost" onClick={handleClear}> <Button size="sm" variant="ghost" onClick={handleClear} className="hover:!bg-primary hover:!text-white transition-colors">
Limpar Limpar
</Button> </Button>
</div> </div>
@ -1383,7 +1383,7 @@ const ProfissionalPage = () => {
setIsViewing(true); setIsViewing(true);
} }
}} }}
className="flex items-center gap-1 hover:bg-blue-50 dark:hover:bg-accent dark:hover:text-accent-foreground" className="flex items-center gap-1 hover:!bg-primary hover:!text-white transition-colors"
> >
<Eye className="w-4 h-4" /> <Eye className="w-4 h-4" />
Ver Laudo Ver Laudo
@ -2457,7 +2457,7 @@ const ProfissionalPage = () => {
Este editor permite escrever relatórios de forma livre, com formatação de texto rica. Este editor permite escrever relatórios de forma livre, com formatação de texto rica.
</div> </div>
<div className="flex gap-2"> <div className="flex gap-2">
<Button variant="outline" onClick={onClose} className="hover:bg-blue-50 dark:hover:bg-accent dark:hover:text-accent-foreground"> <Button variant="outline" onClick={onClose} className="hover:!bg-primary hover:!text-white transition-colors">
Cancelar Cancelar
</Button> </Button>
{/* botão 'Salvar Rascunho' removido por não ser utilizado */} {/* botão 'Salvar Rascunho' removido por não ser utilizado */}
@ -2656,7 +2656,7 @@ const ProfissionalPage = () => {
<Button onClick={handleSaveProfile} className="flex items-center gap-2"> <Button onClick={handleSaveProfile} className="flex items-center gap-2">
Salvar Salvar
</Button> </Button>
<Button variant="outline" onClick={handleCancelEdit} className="hover:bg-blue-50 dark:hover:bg-accent dark:hover:text-accent-foreground"> <Button variant="outline" onClick={handleCancelEdit} className="hover:!bg-primary hover:!text-white transition-colors">
Cancelar Cancelar
</Button> </Button>
</div> </div>
@ -2779,7 +2779,7 @@ const ProfissionalPage = () => {
</Avatar> </Avatar>
{isEditingProfile && ( {isEditingProfile && (
<div className="space-y-2"> <div className="space-y-2">
<Button variant="outline" size="sm" className="hover:bg-primary/10 hover:text-primary dark:hover:bg-accent dark:hover:text-accent-foreground"> <Button variant="outline" size="sm" className="hover:!bg-primary hover:!text-white transition-colors">
Alterar Foto Alterar Foto
</Button> </Button>
<p className="text-xs text-muted-foreground"> <p className="text-xs text-muted-foreground">
@ -2875,7 +2875,7 @@ const ProfissionalPage = () => {
<nav className="bg-card shadow-md rounded-lg border border-border p-3 space-y-1"> <nav className="bg-card shadow-md rounded-lg border border-border p-3 space-y-1">
<Button <Button
variant={activeSection === 'calendario' ? 'default' : 'ghost'} variant={activeSection === 'calendario' ? 'default' : 'ghost'}
className="w-full justify-start transition-colors hover:bg-primary hover:text-white cursor-pointer" className="w-full justify-start transition-colors hover:!bg-primary hover:!text-white cursor-pointer"
onClick={() => setActiveSection('calendario')} onClick={() => setActiveSection('calendario')}
> >
<CalendarIcon className="mr-2 h-4 w-4" /> <CalendarIcon className="mr-2 h-4 w-4" />
@ -2883,7 +2883,7 @@ const ProfissionalPage = () => {
</Button> </Button>
<Button <Button
variant={activeSection === 'pacientes' ? 'default' : 'ghost'} variant={activeSection === 'pacientes' ? 'default' : 'ghost'}
className="w-full justify-start transition-colors hover:bg-primary hover:text-white cursor-pointer" className="w-full justify-start transition-colors hover:!bg-primary hover:!text-white cursor-pointer"
onClick={() => setActiveSection('pacientes')} onClick={() => setActiveSection('pacientes')}
> >
<Users className="mr-2 h-4 w-4" /> <Users className="mr-2 h-4 w-4" />
@ -2891,7 +2891,7 @@ const ProfissionalPage = () => {
</Button> </Button>
<Button <Button
variant={activeSection === 'laudos' ? 'default' : 'ghost'} variant={activeSection === 'laudos' ? 'default' : 'ghost'}
className="w-full justify-start transition-colors hover:bg-primary hover:text-white cursor-pointer" className="w-full justify-start transition-colors hover:!bg-primary hover:!text-white cursor-pointer"
onClick={() => setActiveSection('laudos')} onClick={() => setActiveSection('laudos')}
> >
<FileText className="mr-2 h-4 w-4" /> <FileText className="mr-2 h-4 w-4" />
@ -2899,7 +2899,7 @@ const ProfissionalPage = () => {
</Button> </Button>
<Button <Button
variant={activeSection === 'comunicacao' ? 'default' : 'ghost'} variant={activeSection === 'comunicacao' ? 'default' : 'ghost'}
className="w-full justify-start transition-colors hover:bg-primary hover:text-white cursor-pointer" className="w-full justify-start transition-colors hover:!bg-primary hover:!text-white cursor-pointer"
onClick={() => setActiveSection('comunicacao')} onClick={() => setActiveSection('comunicacao')}
> >
<MessageSquare className="mr-2 h-4 w-4" /> <MessageSquare className="mr-2 h-4 w-4" />
@ -2907,7 +2907,7 @@ const ProfissionalPage = () => {
</Button> </Button>
<Button <Button
variant={activeSection === 'perfil' ? 'default' : 'ghost'} variant={activeSection === 'perfil' ? 'default' : 'ghost'}
className="w-full justify-start transition-colors hover:bg-primary hover:text-white cursor-pointer" className="w-full justify-start transition-colors hover:!bg-primary hover:!text-white cursor-pointer"
onClick={() => setActiveSection('perfil')} onClick={() => setActiveSection('perfil')}
> >
<Settings className="mr-2 h-4 w-4" /> <Settings className="mr-2 h-4 w-4" />
@ -2957,7 +2957,7 @@ const ProfissionalPage = () => {
<Button <Button
onClick={() => setShowPopup(false)} onClick={() => setShowPopup(false)}
variant="outline" variant="outline"
className="flex-1 hover:bg-blue-50 dark:hover:bg-accent dark:hover:text-accent-foreground" className="flex-1 hover:!bg-primary hover:!text-white transition-colors"
> >
Cancelar Cancelar
</Button> </Button>
@ -3072,7 +3072,7 @@ const ProfissionalPage = () => {
<Button <Button
onClick={() => setShowActionModal(false)} onClick={() => setShowActionModal(false)}
variant="outline" variant="outline"
className="w-full mt-2 hover:bg-blue-50 dark:hover:bg-accent dark:hover:text-accent-foreground" className="w-full mt-2 hover:!bg-primary hover:!text-white transition-colors"
> >
Cancelar Cancelar
</Button> </Button>

2
susconecta/components/dashboard/header.tsx
View File

@ -43,7 +43,7 @@ export function PagesHeader({ title = "", subtitle = "" }: { title?: string, sub
</div> </div>
<div className="flex items-center space-x-4"> <div className="flex items-center space-x-4">
<Button variant="ghost" size="icon"> <Button variant="ghost" size="icon" className="hover:!bg-primary hover:!text-white transition-colors">
<Bell className="h-4 w-4" /> <Bell className="h-4 w-4" />
</Button> </Button>

2
susconecta/components/simple-theme-toggle.tsx
View File

@ -17,7 +17,7 @@ export function SimpleThemeToggle() {
variant="outline" variant="outline"
size="icon" size="icon"
onClick={toggleTheme} onClick={toggleTheme}
className="hover:text-muted-foreground cursor-pointer !shadow-sm !shadow-black/10 !border-2 !border-black dark:!shadow-none dark:!border-border" className="hover:!bg-primary hover:!text-white hover:!border-primary cursor-pointer !shadow-sm !shadow-black/10 !border-2 !border-black dark:!shadow-none dark:!border-border transition-colors"
> >
<Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" /> <Sun className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
<Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" /> <Moon className="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />

2
susconecta/components/ui/sidebar.tsx
View File

@ -266,7 +266,7 @@ function SidebarTrigger({
data-slot="sidebar-trigger" data-slot="sidebar-trigger"
variant="ghost" variant="ghost"
size="icon" size="icon"
className={cn("size-7", className)} className={cn("size-7 hover:!bg-primary hover:!text-white transition-colors", className)}
onClick={(event) => { onClick={(event) => {
onClick?.(event) onClick?.(event)
toggleSidebar() toggleSidebar()