Skip to content

refactor: layout component #19

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

Merged
saijaku0 merged 3 commits into from
Feb 13, 2026
Merged

refactor: layout component #19

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
a09e354
fix: registration
saijaku0 Feb 13, 2026
9572a57
feat: add patient dashboard layout
saijaku0 Feb 13, 2026
c15f9fc
fix: refactor layout component
saijaku0 Feb 13, 2026
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
68 changes: 33 additions & 35 deletions app/booking-ui/src/app/admin/layout/admin-layout/admin-layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,45 @@
<div class="layout-container">
<aside class="sidebar" style="border-right-color: #d32f2f">
<div class="brand">
<span class="material-icons logo-icon" style="color: #d32f2f">admin_panel_settings</span>
<h2>AdminPanel</h2>
</div>
<app-main-layout>
<div layout-brand class="brand-box">
<span class="material-icons logo-icon" style="color: #d32f2f">admin_panel_settings</span>
<h2>AdminPanel</h2>
</div>

<nav class="menu">
<a routerLink="/admin/dashboard" routerLinkActive="active" class="menu-item">
<span class="material-icons">analytics</span>
Overview
</a>
<div layout-menu class="menu-list">
<a routerLink="/admin/dashboard" routerLinkActive="active" class="menu-item">
<span class="material-icons">analytics</span>
Overview
</a>

<a routerLink="/admin/specialties" routerLinkActive="active" class="menu-item">
<span class="material-icons">category</span>
Specialties
</a>
<a routerLink="/admin/specialties" routerLinkActive="active" class="menu-item">
<span class="material-icons">category</span>
Specialties
</a>

<a routerLink="/admin/doctors" routerLinkActive="active" class="menu-item">
<span class="material-icons">medical_services</span>
Doctors
</a>
<a routerLink="/admin/doctors" routerLinkActive="active" class="menu-item">
<span class="material-icons">medical_services</span>
Doctors
</a>

<a routerLink="/admin/users" routerLinkActive="active" class="menu-item">
<span class="material-icons">group</span>
Users
</a>
</nav>
<a routerLink="/admin/users" routerLinkActive="active" class="menu-item">
<span class="material-icons">group</span>
Users
</a>
</div>

<div class="user-profile">
<div class="avatar-placeholder" style="background-color: #d32f2f">A</div>
<div class="info">
<p class="name">{{ currentUser()?.email }}</p>
<p class="role">System Admin</p>
</div>
<button (click)="logout()" class="logout-btn">
<span class="material-icons">logout</span>
</button>
<div layout-footer class="user-profile">
<div class="avatar-placeholder" style="background-color: #d32f2f">A</div>
<div class="info">
<p class="name">{{ currentUser()?.email }}</p>
<p class="role">System Admin</p>
</div>
</aside>
<button (click)="logout()" class="logout-btn">
<span class="material-icons">logout</span>
</button>
</div>

<main class="main-content">
<div class="page-content">
<router-outlet></router-outlet>
</div>
</main>
</div>
</app-main-layout>
228 changes: 105 additions & 123 deletions app/booking-ui/src/app/admin/layout/admin-layout/admin-layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,147 +3,129 @@ $admin-primary-light: #ffebee;
$sidebar-width: 280px;
$transition: all 0.2s ease-in-out;

.layout-container {
.brand-box {
padding: 24px;
display: flex;
height: 100vh;
width: 100vw;
background-color: #f5f7fa;
overflow: hidden;
align-items: center;
gap: 12px;

.logo {
font-size: 32px;
color: #2563eb;
}
h2 {
margin: 0;
font-size: 1.25rem;
color: #1f2937;
}
}

.sidebar {
width: $sidebar-width;
background-color: white;
border-right: 1px solid rgba($admin-primary, 0.2);
.menu-item {
display: flex;
flex-direction: column;
flex-shrink: 0;
z-index: 10;
transition: $transition;

.brand {
height: 64px;
display: flex;
align-items: center;
padding: 0 24px;
gap: 12px;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);

.logo-icon {
font-size: 28px;
color: $admin-primary;
}

h2 {
margin: 0;
font-size: 1.25rem;
font-weight: 600;
color: #333;
letter-spacing: -0.5px;
align-items: center;
gap: 12px;
padding: 12px 16px;
color: #4b5563;
text-decoration: none;
border-radius: 8px;
font-weight: 500;
transition: all 0.2s;

&:hover {
background: #f3f4f6;
color: #111827;
}
&.active {
background: #eff6ff;
color: #2563eb;
.material-icons {
color: #2563eb;
}
}
}

.menu {
flex: 1;
padding: 24px 16px;
display: flex;
flex-direction: column;
gap: 8px;
overflow-y: auto;
.user-profile {
padding: 16px;
display: grid;
grid-template-columns: auto 1fr auto;
align-items: center;
gap: 12px;

.avatar {
width: 40px;
height: 40px;
border-radius: 50%;
object-fit: cover;
}
.info p {
margin: 0;
font-size: 0.9rem;
line-height: 1.2;
}
.info .role {
font-size: 0.75rem;
color: #6b7280;
}

.menu-item {
display: flex;
align-items: center;
gap: 12px;
padding: 12px 16px;
text-decoration: none;
color: #666;
font-weight: 500;
border-radius: 12px;
transition: $transition;
font-size: 0.95rem;

.material-icons {
font-size: 20px;
color: inherit;
transition: color 0.2s;
}

&:hover {
background-color: #fafafa;
color: #333;
}

&.active {
background-color: $admin-primary-light;
color: $admin-primary;
font-weight: 600;

.material-icons {
color: $admin-primary;
}
}
.logout-icon-btn {
background: none;
border: none;
color: #9ca3af;
cursor: pointer;
&:hover {
color: #ef4444;
}
}

.user-profile {
padding: 20px 24px;
border-top: 1px solid rgba(0, 0, 0, 0.08);
.avatar-placeholder {
width: 40px;
height: 40px;
border-radius: 50%;
background-color: $admin-primary;
color: white;
display: flex;
align-items: center;
gap: 12px;
background-color: white;

.avatar-placeholder {
width: 40px;
height: 40px;
border-radius: 50%;
background-color: $admin-primary;
color: white;
display: flex;
align-items: center;
justify-content: center;
font-weight: 700;
font-size: 1.1rem;
}
justify-content: center;
font-weight: 700;
font-size: 1.1rem;
}

.info {
flex: 1;
overflow: hidden;

.info {
flex: 1;
.name {
margin: 0;
font-size: 0.9rem;
font-weight: 600;
color: #333;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}

.name {
margin: 0;
font-size: 0.9rem;
font-weight: 600;
color: #333;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}

.role {
margin: 0;
font-size: 0.75rem;
color: $admin-primary;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
}
.role {
margin: 0;
font-size: 0.75rem;
color: $admin-primary;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.5px;
}
}

.logout-btn {
background: none;
border: none;
cursor: pointer;
padding: 8px;
border-radius: 50%;
color: #9ca3af;
transition: $transition;

&:hover {
background-color: $admin-primary-light;
color: $admin-primary;
}
.logout-btn {
background: none;
border: none;
cursor: pointer;
padding: 8px;
border-radius: 50%;
color: #9ca3af;
transition: $transition;

&:hover {
background-color: $admin-primary-light;
color: $admin-primary;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion app/booking-ui/src/app/admin/layout/admin-layout/admin-layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { Component, inject } from '@angular/core';
import { AuthService } from '@core/services/auth/auth.service';
import { RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
import { CommonModule } from '@angular/common';
import { MainLayout } from '@shared/components/main-layout/main-layout';

@Component({
selector: 'app-admin-layout',
imports: [CommonModule, RouterLink, RouterLinkActive, RouterOutlet],
imports: [CommonModule, RouterLink, RouterLinkActive, RouterOutlet, MainLayout],
templateUrl: './admin-layout.html',
styleUrl: './admin-layout.scss',
})
Expand Down
8 changes: 8 additions & 0 deletions app/booking-ui/src/app/app.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { DoctorLayout } from './doctor/layout/doctor-layout/doctor-layout';
import { SpecialtiesComponent } from './admin/pages/specialties/specialties';
import { AdminDashboard } from './admin/pages/admin-dashboard/admin-dashboard';
import { DoctorCalendarComponent } from './doctor/pages/doctor-calendar/doctor-calendar';
import { PatientLayout } from './patient/layout/patient-layout/patient-layout';

export const routes: Routes = [
{ path: '', component: Home },
Expand Down Expand Up @@ -45,5 +46,12 @@ export const routes: Routes = [
{ path: 'doctors', component: DoctorsComponent },
],
},
{
path: 'profile',
component: PatientLayout,
canActivate: [authGuard],
data: { roles: ['patient'] },
children: [{ path: '', redirectTo: 'appointments', pathMatch: 'full' }],
},
{ path: '**', redirectTo: '' },
];
16 changes: 12 additions & 4 deletions app/booking-ui/src/app/core/models/auth.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,24 @@ export enum UserRole {
Patient = 'patient',
}

export enum Gender {
Male = 'Male',
Female = 'Female',
}

export interface LoginRequest {
email: string;
password: string;
}

export interface RegisterRequest {
UserEmail: string;
UserPassword: string;
UserName: string;
UserSurname: string;
userName: string;
userSurname: string;
userEmail: string;
userPassword: string;
dateOfBirth?: string;
gender?: number;
phoneNumber?: string;
}

export interface AuthResponse {
Expand Down
Loading
Loading