Merge pull request #78 from owlistic-notes/sidebar

Restore logout confirmation

Author: DavideRutigliano

src/frontend/lib/screens/home_screen.dart

@@ -88,7 +88,7 @@ class _HomeScreenState extends State<HomeScreen> {
           ThemeSwitcher(), // Add theme switcher to app bar
         ],
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: !_isInitialized
           ? const Center(child: CircularProgressIndicator())
           : RefreshIndicator(

src/frontend/lib/screens/notebook_detail_screen.dart

@@ -218,7 +218,7 @@ class _NotebookDetailScreenState extends State<NotebookDetailScreen> {
           }
         ),
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: _isLoading
           ? const Center(child: CircularProgressIndicator())
           : Consumer<NotebooksViewModel>(

src/frontend/lib/screens/notebooks_screen.dart

@@ -61,7 +61,7 @@ class _NotebooksScreenState extends State<NotebooksScreen> {
         onMenuPressed: () => _scaffoldKey.currentState?.openDrawer(),
         actions: const [ThemeSwitcher()],
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: Consumer<NotebooksViewModel>(
         builder: (context, viewModel, _) {
           return _buildContent(context, viewModel);

src/frontend/lib/screens/notes_screen.dart

@@ -680,7 +680,7 @@ class _NotesScreenState extends State<NotesScreen> {
         onMenuPressed: () => _scaffoldKey.currentState?.openDrawer(),
         actions: const [ThemeSwitcher()],
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: Consumer<NotesViewModel>(
         builder: (context, notesViewModel, _) {
           return _buildBody(notesViewModel);

src/frontend/lib/screens/tasks_screen.dart

@@ -236,7 +236,7 @@ class _TasksScreenState extends State<TasksScreen> {
           }
         },
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: Consumer<TasksViewModel>(
         builder: (ctx, tasksViewModel, _) {
           if (tasksViewModel.isLoading) {

src/frontend/lib/screens/trash_screen.dart

@@ -61,7 +61,7 @@ class _TrashScreenState extends State<TrashScreen> {
         showBackButton: false,
         actions: const [ThemeSwitcher()],
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: Consumer<TrashViewModel>(
         builder: (ctx, trashViewModel, _) {
           if (trashViewModel.isLoading) {

src/frontend/lib/screens/user_profile_screen.dart

@@ -184,7 +184,7 @@ class _UserProfileScreenState extends State<UserProfileScreen> {
         onMenuPressed: () => _scaffoldKey.currentState?.openDrawer(),
         actions: const [ThemeSwitcher()],
       ),
-      drawer: const AppDrawer(),
+      drawer: const SidebarDrawer(),
       body: Consumer<UserProfileViewModel>(
         builder: (context, viewModel, _) {
           if (viewModel.isLoadingProfile) {

src/frontend/lib/widgets/app_drawer.dart

@@ -5,15 +5,14 @@ import 'package:owlistic/core/theme.dart';
 import 'package:owlistic/viewmodel/home_viewmodel.dart';
 import 'app_logo.dart';
 
-class AppDrawer extends StatelessWidget {
-  const AppDrawer({Key? key}) : super(key: key);
+class SidebarDrawer extends StatelessWidget {
+  const SidebarDrawer({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return Drawer(
       child: Column(
         children: [
-          // Smaller drawer header with app logo - using transparent logo
           Container(
             padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16),
             decoration: BoxDecoration(
@@ -35,7 +34,6 @@ class AppDrawer extends StatelessWidget {
               ],
             ),
           ),
-          // Drawer items
           ListTile(
             leading: const Icon(Icons.home),
             title: const Text('Home'),
@@ -68,6 +66,7 @@ class AppDrawer extends StatelessWidget {
               GoRouter.of(context).go('/tasks');
             },
           ),
+          const Divider(height: 1),
           ListTile(
             leading: const Icon(Icons.delete),
             title: const Text('Trash'),
@@ -76,7 +75,6 @@ class AppDrawer extends StatelessWidget {
               GoRouter.of(context).go('/trash');
             },
           ),
-          const Divider(),
           ListTile(
             leading: const Icon(Icons.settings),
             title: const Text('Settings'),
@@ -86,16 +84,12 @@ class AppDrawer extends StatelessWidget {
             },
           ),
           const Spacer(),
-          // Compact logout section
-          const Divider(height: 1),
           ListTile(
             visualDensity: VisualDensity.compact,
             leading: const Icon(Icons.logout),
             title: const Text('Logout'),
             onTap: () async {
-              Navigator.pop(context);
-              // Use HomeViewModel for logout
-              await context.read<HomeViewModel>().logout();
+              _showLogoutConfirmation(context);
             },
           ),
         ],
@@ -116,13 +110,9 @@ class AppDrawer extends StatelessWidget {
           ),
           ElevatedButton(
             onPressed: () async {
-              Navigator.pop(ctx); // Close dialog
-              Navigator.pop(context); // Close drawer
-              
-              // Use the HomeViewModel for logout
+              Navigator.pop(ctx);
+              Navigator.pop(context);
               await context.read<HomeViewModel>().logout();
-              
-              // Navigation will be handled by GoRouter redirect
             },
             style: AppTheme.getDangerButtonStyle(),
             child: const Text('Logout'),