web fixes codes
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
import 'package:tm_app/view_models/profile_view_model.dart';
|
||||
@@ -39,7 +38,7 @@ class _DesktopProfilePageState extends State<DesktopProfilePage> {
|
||||
);
|
||||
}
|
||||
if (viewModel.loggedOut) {
|
||||
LoginScreenRoute().go(context);
|
||||
Router.neglect(context, () => LoginScreenRoute().go(context));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -77,11 +76,17 @@ class _DesktopProfilePageState extends State<DesktopProfilePage> {
|
||||
switch (index) {
|
||||
case 0:
|
||||
// Navigate to home
|
||||
Router.neglect(context, () => context.go('/home'));
|
||||
Router.neglect(
|
||||
context,
|
||||
() => HomeRouteData().go(context),
|
||||
);
|
||||
break;
|
||||
case 1:
|
||||
// Navigate to profile
|
||||
Router.neglect(context, () => context.go('/tenders'));
|
||||
Router.neglect(
|
||||
context,
|
||||
() => TendersRouteData().go(context),
|
||||
);
|
||||
break;
|
||||
case 2:
|
||||
// Already on profile
|
||||
@@ -163,6 +168,7 @@ class _DesktopProfilePageState extends State<DesktopProfilePage> {
|
||||
alignment: Alignment.centerRight,
|
||||
child: InkWell(
|
||||
onTap: () => viewModel.logout(),
|
||||
borderRadius: BorderRadius.circular(100),
|
||||
child: Container(
|
||||
width: 156,
|
||||
height: 56.0.h(),
|
||||
|
||||
@@ -38,7 +38,7 @@ class _MobileProfilePageState extends State<MobileProfilePage> {
|
||||
);
|
||||
}
|
||||
if (viewModel.loggedOut) {
|
||||
LoginScreenRoute().go(context);
|
||||
Router.neglect(context, () => LoginScreenRoute().go(context));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -143,6 +143,7 @@ class _MobileProfilePageState extends State<MobileProfilePage> {
|
||||
Spacer(),
|
||||
InkWell(
|
||||
onTap: () => viewModel.logout(),
|
||||
borderRadius: BorderRadius.circular(100),
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
height: 56.0.h(),
|
||||
|
||||
@@ -5,7 +5,6 @@ import 'package:provider/provider.dart';
|
||||
import 'package:tm_app/core/constants/assets.dart';
|
||||
import 'package:tm_app/core/constants/strings.dart';
|
||||
import 'package:tm_app/core/routes/app_routes.dart';
|
||||
import 'package:tm_app/view_models/home_view_model.dart';
|
||||
import 'package:tm_app/view_models/profile_view_model.dart';
|
||||
|
||||
import '../../../core/theme/colors.dart';
|
||||
@@ -40,7 +39,7 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
|
||||
);
|
||||
}
|
||||
if (viewModel.loggedOut) {
|
||||
LoginScreenRoute().go(context);
|
||||
Router.neglect(context, () => LoginScreenRoute().go(context));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,12 +102,15 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
|
||||
switch (index) {
|
||||
case 0:
|
||||
context.pop();
|
||||
Router.neglect(context, () => context.go('/home'));
|
||||
context.read<HomeViewModel>().init();
|
||||
Router.neglect(context, () => HomeRouteData().go(context));
|
||||
|
||||
break;
|
||||
case 1:
|
||||
context.pop();
|
||||
Router.neglect(context, () => context.go('/tenders'));
|
||||
Router.neglect(
|
||||
context,
|
||||
() => TendersRouteData().go(context),
|
||||
);
|
||||
break;
|
||||
}
|
||||
},
|
||||
@@ -190,6 +192,7 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
|
||||
alignment: Alignment.centerRight,
|
||||
child: InkWell(
|
||||
onTap: () => viewModel.logout(),
|
||||
borderRadius: BorderRadius.circular(100),
|
||||
child: Container(
|
||||
width: 156,
|
||||
height: 56.0.h(),
|
||||
|
||||
Reference in New Issue
Block a user