Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 5 additions & 20 deletions .metadata
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This file should be version controlled and should not be manually edited.

version:
revision: "f6ff1529fd6d8af5f706051d9251ac9231c83407"
revision: "bd7a4a6b5576630823ca344e3e684c53aa1a0f46"
channel: "stable"

project_type: app
Expand All @@ -13,26 +13,11 @@ project_type: app
migration:
platforms:
- platform: root
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
- platform: android
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
- platform: ios
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
- platform: linux
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
- platform: macos
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
- platform: web
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
- platform: windows
create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
create_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46
base_revision: bd7a4a6b5576630823ca344e3e684c53aa1a0f46

# User provided section

Expand Down
7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"cSpell.words": [
"Forgetpassword",
"Onboardingscreen",
"Resetpassword"
]
}
Empty file added json_output.txt
Empty file.
45 changes: 42 additions & 3 deletions lib/app/config/di/di.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 19 additions & 1 deletion lib/app/core/api_manger/api_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,35 @@ import 'package:tracking_app/features/auth/data/model/request/LoginRequest.dart'
import 'package:tracking_app/features/auth/data/model/response/LoginResponse.dart';
import 'package:dio/dio.dart' hide Headers;
import 'package:retrofit/retrofit.dart';
import 'package:tracking_app/features/auth/data/models/request/forget_password_request.dart';
import 'package:tracking_app/features/auth/data/models/request/resetpassword_request.dart';
import 'package:tracking_app/features/auth/data/models/request/verifyreset_request.dart';
import 'package:tracking_app/features/auth/data/models/response/forgetpassword_response.dart';
import 'package:tracking_app/features/auth/data/models/response/resetpassword_response.dart';
import 'package:tracking_app/features/auth/data/models/response/verifyreset_response.dart';
import '../../../features/auth/data/models/response/apply_response_model.dart';
import '../../../features/auth/data/models/request/apply_request_model.dart';
import '../../../features/auth/data/models/response/vehicles_response_model.dart';
import '../values/app_endpoint_strings.dart';

part 'api_client.g.dart';

@RestApi()
@RestApi(baseUrl: AppEndpointString.baseUrl)
abstract class ApiClient {
factory ApiClient(Dio dio) = _ApiClient;

@POST(AppEndpointString.sendEmail)
Future<HttpResponse<ForgetpasswordResponse>> forgetPassword(
@Body() ForgetPasswordRequest request,
);
@PUT(AppEndpointString.resetPassword)
Future<HttpResponse<ResetpasswordResponse>> resetPassword(
@Body() ResetPasswordRequest request,
);
@POST(AppEndpointString.verifyResetCode)
Future<HttpResponse<VerifyresetResponse>> verifyResetCode(
@Body() VerifyResetRequest request,
);
@PATCH(AppEndpointString.changePassword)
Future<HttpResponse<ChangePasswordDto>> changePassword(
@Body() Map<String, dynamic> body,
Expand Down
94 changes: 93 additions & 1 deletion lib/app/core/api_manger/api_client.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 42 additions & 7 deletions lib/app/core/router/app_router.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:tracking_app/app/config/auth_storage/auth_storage.dart';
import 'package:tracking_app/app/config/di/di.dart';
import 'package:tracking_app/app/core/router/route_names.dart';
import 'package:tracking_app/features/auth/presentation/reset_password/pages/change_password_page.dart';
import 'package:tracking_app/features/Onboarding/presentation/pages/onboardingScreen.dart';
import 'package:tracking_app/features/app_sections/presentation/pages/app_sections.dart';
import 'package:tracking_app/features/auth/presentation/apply/view/apply_view.dart';
import 'package:tracking_app/features/auth/presentation/forget_pass/manager/cubit/forget_pass_cubit.dart';
import 'package:tracking_app/features/auth/presentation/forget_pass/pages/forget_pass_page.dart';
import 'package:tracking_app/features/auth/presentation/login/pages/loginScreen.dart';
import 'package:tracking_app/app/config/auth_storage/auth_storage.dart';
import 'package:tracking_app/app/config/di/di.dart';
import 'package:tracking_app/features/auth/presentation/reset_password/manager/reset_password_cubit.dart';
import 'package:tracking_app/features/auth/presentation/reset_password/pages/change_password_page.dart';
import 'package:tracking_app/features/auth/presentation/reset_password/pages/reset_password.dart';
import 'package:tracking_app/features/auth/presentation/verify_reset/manger/cubit/verify_reset_cubit.dart';
import 'package:tracking_app/features/auth/presentation/verify_reset/pages/verify_reset_page.dart';
import 'package:tracking_app/features/profile/presentation/pages/profile_page.dart';
import 'package:tracking_app/app/core/router/route_names.dart';
import 'package:tracking_app/features/auth/presentation/apply/view/apply_view.dart';


final GoRouter appRouter = GoRouter(
initialLocation: RouteNames.onboarding,
Expand Down Expand Up @@ -38,6 +45,36 @@ final GoRouter appRouter = GoRouter(
path: RouteNames.applyScreen,
builder: (context, state) => const ApplyScreen(),
),
GoRoute(
path: RouteNames.verifyResetCode,
builder: (context, state) {
final email = state.extra as String;

return BlocProvider(
create: (_) => getIt<VerifyResetCodeCubit>(param1: email),
child: VerifyResetCodePage(email: email),
);
},
),
GoRoute(
path: RouteNames.forgetPassword,
builder: (context, state) => BlocProvider(
create: (_) => getIt<ForgetPasswordCubit>(),
child: const ForgetPasswordPage(),
),
),

GoRoute(
path: RouteNames.resetPassword,
builder: (context, state) => BlocProvider(
create: (_) => getIt<ResetPasswordCubit>(param1: state.extra as String),
child: const ResetPasswordPage(),
),
),
GoRoute(
path: RouteNames.profile,
builder: (context, state) => const ProfilePage(),
),
],
redirect: (context, state) async {
final token = await getIt<AuthStorage>().getToken();
Expand All @@ -53,5 +90,3 @@ final GoRouter appRouter = GoRouter(
return null;
},
);


9 changes: 5 additions & 4 deletions lib/app/core/router/route_names.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
abstract class RouteNames {
static const signup = '/signup';
static const login = '/login';
static const forgetPassword = '/forget-password';
static const verifyResetCode = '/verify-reset-code';
static const resetPassword = '/reset-password';
static const home = '/home';
static const profile = '/profile';
static const appStart = '/appStart';
static const changePassword = '/changePassword';
static const profile = '/profile';
static const applyScreen = '/applyScreen';
static const onboarding = '/onboarding';



}
6 changes: 3 additions & 3 deletions lib/app/core/values/app_endpoint_strings.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
class AppEndpointString {
static const String baseUrl = 'https://flower.elevateegy.com/api/v1/';
static const String loginEndpoint = 'auth/signin';
static const String sendEmail = 'auth/forgotPassword';
static const String verifyResetCode = 'auth/verifyResetCode';
static const String resetPassword = 'auth/resetPassword';
static const String sendEmail = 'drivers/forgotPassword';
static const String verifyResetCode = 'drivers/verifyResetCode';
static const String resetPassword = 'drivers/resetPassword';

static const String profileData = 'auth/profile-data';
static const String uploadPhoto = 'auth/upload-photo';
Expand Down
Loading