kishan.bhuta/Regroup
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Merge pull request #80 from WDI-Ideas/k25july

Browse Source 
login and minor bug fix
This commit is contained in:
Kishan Bhuta
2024-07-29 19:05:07 +05:30
committed by GitHub
parent f45aeebfd8 5b92d23bcb
commit 8714ffeb6d
3 changed files with 22 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/Feed Module/Main_Screens/ProfileTab/EditProfile/View/ProfileTab.dart
View File

@@ -489,39 +489,7 @@ class _ProfileTabState extends State<ProfileTab> {
getEditProfileIndi!.data!
.timelines![index];
// List<Map<String, dynamic>>
// abilities =
// timeline.abilities!
// .map((ability) => {
// 'id': ability.id,
// 'name':
// ability.name,
// })
// .toList();
return
// commonTimelineCard(
// imagePath: getEditProfileIndi
// ?.data
// ?.profileImage ??
// '',
// title: getEditProfileIndi!
// .data!
// .timelines![index]
// .clubName!,
// role: getEditProfileIndi!
// .data!
// .timelines![index]
// .roleName!,
// teamname: getEditProfileIndi!
// .data!
// .timelines![index]
// .teamName!,
// abilities: abilities,
// id: getEditProfileIndi!.data!
// .timelines![index].id,
// starttoend: startToEnd,
// );
Row(
return Row(
children: [
SizedBox(
width: 10,
@@ -561,7 +529,7 @@ class _ProfileTabState extends State<ProfileTab> {
commonGlassUI(
width:
double.infinity,
height: 170.h,
height: 174.h,
borderRadius:
BorderRadius
.circular(
@@ -628,17 +596,6 @@ class _ProfileTabState extends State<ProfileTab> {
InkWell(
onTap:
() {
// setState(
// () {
// timelineremoveid =
// getEditProfileIndi!.data!.timelines![index].id ?? 0;
// getEditProfileIndi!.data!.timelines!.removeWhere((item) =>
// item.id! ==
// timelineremoveid);
// // .removeAt(index);
// RemoveTimelineUploadata();
// });
Get.toNamed(RouteName.addtimeline, arguments: {
'id': getEditProfileIndi!.data!.timelines![index].id,
'edit': true,
@@ -769,7 +726,6 @@ class _ProfileTabState extends State<ProfileTab> {
// String formattedNames = abilityName.join(', ');
List<String> abilityNames = abilityName.split(',').map((e) => e.trim()).toList();
String formattedNames = abilityNames.join(', ');
print(formattedNames);
return Padding(
padding: EdgeInsets.only(right: 8.w),
child: text10400whiteblur(formattedNames),
@@ -834,7 +790,7 @@ class _ProfileTabState extends State<ProfileTab> {
children: [
commonGlassUI(
width: 266.w,
height: 70.h,
height: 75.h,
borderRadius:
BorderRadius
.circular(10.r),

45
lib/Login/View/loginscreen.dart
View File

@@ -75,21 +75,21 @@ class _LoginScreenState extends State<LoginScreen> {
);
// Get.toNamed(RouteName.mainscreen,arguments: 0);
await Getuserdetails().Getuser().then((value) {
if (getuserobj?.data?.userData?.isProfileUpdated == 0) {
String? accountype =
getuserobj?.data?.userData?.principalTypeXid.toString();
if (getuserobj?.data?.userData?.isProfileUpdated == 0) {
String? accountype =
getuserobj?.data?.userData?.principalTypeXid.toString();
if (accountype == "1") {
Get.toNamed(RouteName.tellusindividualscreen,
arguments: {'pageroute': "mainscreen"});
} else if (accountype == "2") {
Get.toNamed(RouteName.tellusbusinessscreen,
arguments: {'pageroute': "mainscreen"});
if (accountype == "1") {
Get.toNamed(RouteName.tellusindividualscreen,
arguments: {'pageroute': "mainscreen"});
} else if (accountype == "2") {
Get.toNamed(RouteName.tellusbusinessscreen,
arguments: {'pageroute': "mainscreen"});
}
} else {
Get.toNamed(RouteName.mainscreen, arguments: 0);
}
} else {
Get.toNamed(RouteName.mainscreen,arguments: 0);
}
});
});
logger.d("go to login");
}
} else {
@@ -294,13 +294,13 @@ class _LoginScreenState extends State<LoginScreen> {
image: DecorationImage(
image:
AssetImage("assets/images/png/Choice screen.png"),
fit: BoxFit.cover)),
fit: BoxFit.fill)),
),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
height: 150.h,
height: 130.h,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w),
@@ -308,7 +308,7 @@ class _LoginScreenState extends State<LoginScreen> {
alignment: Alignment.center,
child: Container(
width: 107.w,
height: 70.h,
height: 86.h,
child: SvgPicture.asset(
"assets/images/svg/onboarding2.svg",
fit: BoxFit.cover,
@@ -356,18 +356,7 @@ class _LoginScreenState extends State<LoginScreen> {
}
return null;
},
// onInput: (p0) {
// if (p0!.isEmpty) {
// errormsg.value = 'Enter your e-mail address';
// }
// if (!RegExp(
// r'^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$')
// .hasMatch(p0!)) {
// errormsg.value = 'Enter a valid e-mail address';
// }
// return null;
// },
// validatorText: "Email Id",
inputFormatters: [
LengthLimitingTextInputFormatter(30),

4
lib/Utils/Common/CustomTextformfield.dart
View File

@@ -81,7 +81,7 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GlassContainer(
height: 50.h,
height: 52.h,
width: double.infinity,
gradient: LinearGradient(
begin: Alignment.topLeft,
@@ -463,7 +463,7 @@ class _CustomtextFormFieldPasswordState
decoration: InputDecoration(
hintStyle: TextStyle(
fontSize: 16.sp,
color: const Color.fromARGB(255, 130, 128, 128),
color: const Color.fromARGB(255, 130, 128, 128),
fontWeight: FontWeight.w400,
fontFamily: 'Helvetica'),
labelStyle: const TextStyle(color: Colors.white),