1111

lib/core/services/request_service.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
-import '../models/leave_request.dart';
-import '../models/advance_request.dart';
+import '../../models/leave_request.dart';
+import '../../models/advance_request.dart';
 
 class RequestService {
   // Singleton implementation

lib/main.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 
 import 'core/di/injection_container.dart';
-import 'screens/splash_screen.dart';
+import 'presentation/screens/splash_screen.dart';
 
 void main() async {
   WidgetsBinding widgetsBinding = WidgetsFlutterBinding.ensureInitialized();

lib/presentation/screens/attendence_screen.dart

@@ -1,6 +1,6 @@
-import 'package:coda_project/screens/face_screen.dart';
-import 'package:coda_project/screens/notifications_screen.dart';
-import 'package:coda_project/screens/user_settings_screen.dart';
+import 'package:coda_project/presentation/screens/face_screen.dart';
+import 'package:coda_project/presentation/screens/notifications_screen.dart';
+import 'package:coda_project/presentation/screens/user_settings_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import '../widgets/settings_bar.dart';

lib/presentation/screens/auth_screen.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../widgets/app_background.dart';
 import '../widgets/auth_form.dart';
-import '../core/di/injection_container.dart';
-import '../presentation/blocs/login/login_bloc.dart';
+import '../../core/di/injection_container.dart';
+import '../blocs/login/login_bloc.dart';
 
 class AuthScreen extends StatelessWidget {
   const AuthScreen({super.key});

lib/presentation/screens/finance_screen.dart

@@ -1,5 +1,5 @@
-import 'package:coda_project/screens/notifications_screen.dart';
-import 'package:coda_project/screens/user_settings_screen.dart';
+import 'package:coda_project/presentation/screens/notifications_screen.dart';
+import 'package:coda_project/presentation/screens/user_settings_screen.dart';
 import 'package:flutter/material.dart';
 import '../widgets/finance_summary_card.dart';
 import '../widgets/work_day_card.dart';

lib/presentation/screens/holiday_screen.dart

@@ -1,15 +1,15 @@
-import 'package:coda_project/screens/notifications_screen.dart';
-import 'package:coda_project/screens/user_settings_screen.dart';
+import 'package:coda_project/presentation/screens/notifications_screen.dart';
+import 'package:coda_project/presentation/screens/user_settings_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 import '../widgets/settings_bar.dart';
-import '../screens/request_leave_screen.dart';
-import '../screens/request_advance_scrren.dart';
-import '../models/leave_request.dart';
-import '../models/advance_request.dart';
-import '../services/request_service.dart';
+import 'request_leave_screen.dart';
+import 'request_advance_scrren.dart';
+import '../../models/leave_request.dart';
+import '../../models/advance_request.dart';
+import '../../core/services/request_service.dart';
 
 class HolidayScreen extends StatefulWidget {
   final void Function(bool isScrollingDown)? onScrollEvent;

lib/presentation/screens/main_screen.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import '../widgets/app_background.dart';
-import '../widgets/floatingnavbar.dart';
-import '../screens/attendence_screen.dart';
-import '../screens/finance_screen.dart';
-import '../screens/holiday_screen.dart';
+import '../../widgets/floatingnavbar.dart';
+import 'attendence_screen.dart';
+import 'finance_screen.dart';
+import 'holiday_screen.dart';
 
 class MainPage extends StatefulWidget {
   const MainPage({super.key});

lib/presentation/screens/onboarding_screen.dart

@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:coda_project/screens/auth_screen.dart';
+import 'package:coda_project/presentation/screens/auth_screen.dart';
 import 'package:flutter/material.dart';
 import '../widgets/onboarding_page.dart';
 import '../widgets/onboarding_button.dart';

lib/presentation/screens/request_advance_scrren.dart

@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import '../widgets/app_background.dart';
 import '../widgets/settings_bar.dart';
 import '../widgets/onboarding_button.dart';
-import '../models/advance_request.dart';
-import '../services/request_service.dart';
+import '../../models/advance_request.dart';
+import '../../core/services/request_service.dart';
 
 class RequestAdvanceScreen extends StatefulWidget {
   const RequestAdvanceScreen({super.key});

lib/presentation/screens/request_leave_screen.dart

@@ -3,8 +3,8 @@ import 'package:flutter_svg/flutter_svg.dart';
 import '../widgets/app_background.dart';
 import '../widgets/settings_bar.dart';
 import '../widgets/onboarding_button.dart';
-import '../models/leave_request.dart';
-import '../services/request_service.dart';
+import '../../models/leave_request.dart';
+import '../../core/services/request_service.dart';
 
 class RequestLeaveScreen extends StatefulWidget {
   const RequestLeaveScreen({super.key});

lib/presentation/screens/user_settings_screen.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import '../widgets/app_background.dart';
 import '../widgets/settings_bar.dart';
-import '../screens/about_screen.dart';
-import '../screens/auth_screen.dart';
+import 'about_screen.dart';
+import 'auth_screen.dart';
 import '../widgets/change_password_modal.dart';
 
 

lib/presentation/widgets/auth_form.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import '../screens/main_screen.dart';
-import '../domain/models/login_request.dart';
-import '../presentation/blocs/login/login_bloc.dart';
-import '../presentation/blocs/login/login_event.dart';
-import '../presentation/blocs/login/login_state.dart';
+import '../../domain/models/login_request.dart';
+import '../blocs/login/login_bloc.dart';
+import '../blocs/login/login_event.dart';
+import '../blocs/login/login_state.dart';
 import 'onboarding_button.dart';
 
 class AuthForm extends StatefulWidget {

lib/presentation/widgets/change_password_modal.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../widgets/onboarding_button.dart';
+import 'onboarding_button.dart';
 
 class ChangePasswordModal extends StatefulWidget {
   const ChangePasswordModal({super.key});

lib/presentation/widgets/login_animation.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import '../widgets/app_background.dart';
+import 'app_background.dart';
 
 class LoginAnimationScreen extends StatefulWidget {
   final bool isLogin;

lib/presentation/widgets/work_day_card.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import '../widgets/gradient_line.dart';
-import '../widgets/status_circle.dart';
+import 'gradient_line.dart';
+import 'status_circle.dart';
 
 class WorkDayCard extends StatelessWidget {
   const WorkDayCard({super.key});