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
Binary file added assets/user.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions lib/entities/user/SchoolData.dart
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import 'package:json_annotation/json_annotation.dart';
import 'package:meta/meta.dart';

part 'SchoolData.g.dart';

@JsonSerializable(explicitToJson: true)
class SchoolData {
const SchoolData({
@required this.school,
});

final String school;

factory SchoolData.fromJson(Map<String, dynamic> json) =>
_$SchoolDataFromJson(json);
factory SchoolData.fromJson(Map<String, dynamic> json) {
return SchoolData(school: json['school'] as String);
}

Map<String, dynamic> toJson() => _$SchoolDataToJson(this);
Map<String, dynamic> toJson() => <String,dynamic>{
'school': school
};
}
18 changes: 0 additions & 18 deletions lib/entities/user/SchoolData.g.dart

This file was deleted.

2 changes: 1 addition & 1 deletion lib/entities/user/UserData.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class UserData {
'bio': <String, dynamic>{
'name': name,
'semester': semester,
'school': schoolData?.toJson()
'school': schoolData.school
},
'favorite_subjects': favSubjects,
'favorite_teachers': favTeachers,
Expand Down
3 changes: 1 addition & 2 deletions lib/pages/user_profile/UserProfile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ class _UserProfileState extends PageState<UserProfile> {
BlankPadding(),
CircleAvatar(
backgroundColor: Colors.lightBlue.shade100,
backgroundImage: NetworkImage(
'https://aux2.iconspalace.com/uploads/manager-icon-256.png'),
backgroundImage: Image.asset("assets/user.png").image,
radius: 32,
),
BlankPadding(),
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ flutter:
- assets/fireworks.png
- assets/baby.png
- assets/contact.png
- assets/user.png
- assets/signup_instructions1.png
- assets/signup_instructions2.png
- assets/swipe.png
Expand Down