conflict resolve
This commit is contained in:
@@ -18,9 +18,6 @@ class RouteName {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
static const String verifyotp = '/verifyotp';
|
||||
|
||||
//secureaccess
|
||||
@@ -28,4 +25,18 @@ class RouteName {
|
||||
static const String faceid = '/faceid';
|
||||
static const String fingerprint = '/fingerprint';
|
||||
static const String pin = '/pin';
|
||||
|
||||
//add details
|
||||
static const String adddetails = '/adddetails';
|
||||
|
||||
//kyc
|
||||
static const String kyc = '/kyc';
|
||||
|
||||
//update risk profile
|
||||
static const String updateriskprofile = '/updateriskprofile';
|
||||
|
||||
//sidemenu
|
||||
static const String termsandcondition = '/termsandcondition';
|
||||
static const String privacypolicy = '/privacypolicy';
|
||||
static const String aboutus = '/aboutus';
|
||||
}
|
||||
|
||||
@@ -2,12 +2,21 @@ import 'package:get/get.dart';
|
||||
import 'package:traderscircuit/Utils/Common/noInternet.dart';
|
||||
import 'package:traderscircuit/resources/routes/route_name.dart';
|
||||
import 'package:traderscircuit/view/MainScreen/ExploreUnseen.dart';
|
||||
import 'package:traderscircuit/view/Sidemenu/AboutUs.dart';
|
||||
import 'package:traderscircuit/view/Sidemenu/PrivacyPolicy.dart';
|
||||
import 'package:traderscircuit/view/Sidemenu/TermsAndCondition.dart';
|
||||
|
||||
import 'package:traderscircuit/view/login/AddDetails.dart';
|
||||
import 'package:traderscircuit/view/login/Kyc.dart';
|
||||
|
||||
import 'package:traderscircuit/view/MainScreen/HomeScreen.dart';
|
||||
import 'package:traderscircuit/view/MainScreen/MainScreen.dart';
|
||||
import 'package:traderscircuit/view/MainScreen/Notification.dart';
|
||||
import 'package:traderscircuit/view/MainScreen/ShortTrade.dart';
|
||||
import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart';
|
||||
|
||||
import 'package:traderscircuit/view/login/LoginScreen.dart';
|
||||
import 'package:traderscircuit/view/login/UpdateRiskProfile.dart';
|
||||
import 'package:traderscircuit/view/login/VerifyOtp.dart';
|
||||
import 'package:traderscircuit/view/onBoarding/splashScreen.dart';
|
||||
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
|
||||
@@ -94,5 +103,36 @@ class AppRoutes {
|
||||
name: RouteName.exploreUnseen,
|
||||
page: () => const ExploreUnseen(),
|
||||
),
|
||||
//add details
|
||||
GetPage(
|
||||
name: RouteName.adddetails,
|
||||
page: () => const AddDetails(),
|
||||
),
|
||||
|
||||
//kyc
|
||||
GetPage(
|
||||
name: RouteName.kyc,
|
||||
page: () => const Kyc(),
|
||||
),
|
||||
|
||||
//update risk profile
|
||||
GetPage(
|
||||
name: RouteName.updateriskprofile,
|
||||
page: () => const UpdateRiskProfile(),
|
||||
),
|
||||
|
||||
//sidemenu
|
||||
GetPage(
|
||||
name: RouteName.termsandcondition,
|
||||
page: () => const TermsAndConditions(),
|
||||
),
|
||||
GetPage(
|
||||
name: RouteName.privacypolicy,
|
||||
page: () => const PrivacyPolicy(),
|
||||
),
|
||||
GetPage(
|
||||
name: RouteName.aboutus,
|
||||
page: () => const AboutUs(),
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user