Skip to content

Commit 0f112a8

Browse files
Musa-MabasaMusa-Mabasa
committed
🐛 fixed bugs
1 parent 8e4950c commit 0f112a8

File tree

7 files changed

+156
-117
lines changed

7 files changed

+156
-117
lines changed

‎lib/src/Navigation/tutee_nav_drawer.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,10 @@ class TuteeNavigationDrawerState extends State<TuteeNavigationDrawerWidget> {
155155
SharedPreferences preferences =
156156
await SharedPreferences.getInstance();
157157
preferences.clear();
158-
Navigator.push(
158+
Navigator.pushAndRemoveUntil(
159159
context,
160160
MaterialPageRoute(builder: (context) => const Login()),
161+
((route) => false),
161162
);
162163
},
163164
),

‎lib/src/Navigation/tutor_nav_drawer.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,10 @@ class TutorNavigationDrawerState extends State<TutorNavigationDrawerWidget> {
137137
await SharedPreferences.getInstance();
138138
preferences.clear();
139139

140-
Navigator.push(
140+
Navigator.pushAndRemoveUntil(
141141
context,
142142
MaterialPageRoute(builder: (context) => const Login()),
143+
((route) => false),
143144
);
144145
},
145146
),

‎lib/src/admin/login.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ class LoginAdminState extends State<LoginAdmin> {
163163
global = await AdminServices.logInAdmin(
164164
emailController.text,
165165
passwordController.text);
166+
167+
global.setPassword = passwordController.text;
166168
Navigator.push(
167169
context,
168170
MaterialPageRoute(

‎lib/src/admin/review_tutor.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class ReviewTutorState extends State<ReviewTutor> {
4343
getTutors() async {
4444
tutors = await UserServices.getTutors(widget.globals);
4545
tutors.removeWhere((tutor) => tutor.getIsVerified == true);
46+
4647
getTutorDetails();
4748
}
4849

@@ -53,8 +54,6 @@ class ReviewTutorState extends State<ReviewTutor> {
5354
tutor.getInstitutionID, widget.globals);
5455

5556
institutions.add(institution.getName);
56-
57-
5857
}
5958
log(institutions.toString());
6059
} catch (e) {
@@ -74,6 +73,7 @@ class ReviewTutorState extends State<ReviewTutor> {
7473
transcripts.add(transcript);
7574
hasTranscript.add(true);
7675
} catch (e) {
76+
print(e);
7777
log(e.toString());
7878
Uint8List? empty = Uint8List(128);
7979
transcripts.add(empty);

‎lib/src/authenticate/login.dart

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,12 @@ class _LoginState extends State<Login> {
229229
await SharedPreferences.getInstance();
230230

231231
preferences.setString('globals', globalJson);
232-
Navigator.push(
232+
Navigator.pushAndRemoveUntil(
233233
context,
234234
MaterialPageRoute(
235235
builder: (context) =>
236236
TutorPage(globals: globals)),
237+
((route) => false),
237238
);
238239

239240
//Get num of connections
@@ -422,20 +423,21 @@ class _LoginState extends State<Login> {
422423
// TutorServices tutor = TutorServices.Login(
423424
globals = await UserServices.logInTutee(
424425
emailController.text, passwordController.text);
425-
globals.setPassword = passwordController.text;
426-
426+
globals.setPassword = passwordController.text;
427427

428428
final globalJson = json.encode(globals.toJson());
429429
SharedPreferences preferences =
430430
await SharedPreferences.getInstance();
431431

432-
433432
preferences.setString('globals', globalJson);
434-
Navigator.push(
433+
Navigator.pushAndRemoveUntil(
435434
context,
436435
MaterialPageRoute(
437436
builder: (context) =>
438-
TuteePage(globals: globals)),
437+
TuteePage(globals: globals),
438+
439+
),
440+
(route) => false,
439441
);
440442

441443
List<Badge> fetchedBadges =
@@ -446,37 +448,38 @@ class _LoginState extends State<Login> {
446448
}
447449
}
448450

449-
List<UserBadge> userBadges =
450-
List<UserBadge>.empty(growable: true);
451+
try {
452+
List<UserBadge> userBadges =
453+
List<UserBadge>.empty(growable: true);
451454

452-
userBadges =
453-
await UserBadges.getAllUserBadgesByUserId(
454-
globals);
455+
userBadges =
456+
await UserBadges.getAllUserBadgesByUserId(
457+
globals);
455458

456-
bool isThere = false;
457-
int index = 0;
459+
bool isThere = false;
460+
int index = 0;
458461

459-
for (int k = 0; k < userBadges.length; k++) {
460-
for (int j = 0; j < fetchedBadges.length; j++) {
461-
if (userBadges[k].getBadgeId ==
462-
fetchedBadges[j].getBadgeId) {
463-
isThere = true;
462+
for (int k = 0; k < userBadges.length; k++) {
463+
for (int j = 0; j < fetchedBadges.length; j++) {
464+
if (userBadges[k].getBadgeId ==
465+
fetchedBadges[j].getBadgeId) {
466+
isThere = true;
464467

468+
break;
469+
}
470+
}
471+
if (isThere == false) {
472+
await UserBadges.addUserBadge(
473+
globals.getUser.getId,
474+
fetchedBadges[index].getBadgeId,
475+
1,
476+
globals,
477+
);
465478
break;
466479
}
467480
}
468-
if (isThere == false) {
469-
await UserBadges.addUserBadge(
470-
globals.getUser.getId,
471-
fetchedBadges[index].getBadgeId,
472-
1,
473-
globals,
474-
);
475-
break;
476-
}
477-
try {} catch (e) {
478-
log(e.toString());
479-
}
481+
} catch (e) {
482+
log(e.toString());
480483
}
481484

482485
setState(() {

‎lib/src/pages/calendar_screen.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import '../../services/services/events_services.dart';
1111
import '../../services/services/user_services.dart';
1212
import '../theme/themes.dart';
1313

14-
1514
class CalendarScreen extends StatefulWidget {
1615
final Globals globals;
1716
const CalendarScreen({Key? key, required this.globals}) : super(key: key);
@@ -33,6 +32,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
3332
widget.globals.getUser.getId, widget.globals);
3433
events = incomingEvents;
3534
} catch (e) {
35+
print(e);
3636
const snack = SnackBar(content: Text('Error loading events'));
3737
ScaffoldMessenger.of(context).showSnackBar(snack);
3838
}
@@ -44,9 +44,10 @@ class _CalendarScreenState extends State<CalendarScreen> {
4444
for (int i = 0; i < events.length; i++) {
4545
final incomingOwner =
4646
await UserServices.getTutor(events[i].getOwnerId, widget.globals);
47-
owner += incomingOwner;
47+
owner.add(incomingOwner);
4848
}
4949
} catch (e) {
50+
print(e);
5051
const snack = SnackBar(content: Text('Error loading events'));
5152
ScaffoldMessenger.of(context).showSnackBar(snack);
5253
}
@@ -355,7 +356,6 @@ class _CalendarScreenState extends State<CalendarScreen> {
355356
});
356357
}),
357358
child: const Text('Time')),
358-
359359
],
360360
)
361361

0 commit comments

Comments
 (0)