🐛 works again

pull/7/head
remrem 2 years ago
parent 884e5f0b8e
commit 7fc300c050

@ -34,23 +34,21 @@ class MyApp extends StatelessWidget {
Widget viewToDisplay = const SignUpView(); Widget viewToDisplay = const SignUpView();
// Skip sign-up + fill provider if user already connected // Skip sign-up + fill provider if user already connected
if (!kIsWeb) { if (!kIsWeb && localDB.hasUser()) {
if (localDB.hasUser()) { final User user = localDB.getUser();
final User user = localDB.getUser(); final userActivities = localDB.getAllActivities();
final userActivities = localDB.getAllActivities();
context.watch<User>().username = user.username; context.watch<User>().username = user.username;
context.watch<User>().email = user.email; context.watch<User>().email = user.email;
context.watch<User>().token = user.token; context.watch<User>().token = user.token;
context.watch<User>().listActivity = userActivities; context.watch<User>().listActivity = userActivities;
stdout.write("===== USER =====\n"); stdout.write("===== USER =====\n");
stdout.write("Username: ${user.username}\n"); stdout.write("Username: ${user.username}\n");
stdout.write("Email: ${user.email}\n"); stdout.write("Email: ${user.email}\n");
stdout.write("Token: ${user.token}\n"); stdout.write("Token: ${user.token}\n");
viewToDisplay = const MainTabView(); viewToDisplay = const MainTabView();
}
} }
return MaterialApp( return MaterialApp(

@ -45,7 +45,6 @@ class ObjectBox implements DbImpl {
@override @override
User getUser() { User getUser() {
db.User userRes = userBox.get(1); db.User userRes = userBox.get(1);
return User.create(userRes.username, userRes.email, userRes.token); return User.create(userRes.username, userRes.email, userRes.token);
} }
@ -83,8 +82,7 @@ class ObjectBox implements DbImpl {
// ===== Activity ===== // ===== Activity =====
@override @override
void addActivity(String uuid, String filename, String category, String info) { void addActivity(String uuid, String filename, String category, String info) {
db.Activity act = db.Activity act = db.Activity(0, uuid, filename, category, info);
db.Activity(0, uuid, filename, category, jsonEncode(info));
try { try {
activityBox.put(act); activityBox.put(act);
@ -125,6 +123,7 @@ class ObjectBox implements DbImpl {
for (db.Activity act in activityDBList) { for (db.Activity act in activityDBList) {
ActivityInfo actInfo = ActivityInfo.fromJson(jsonDecode(act.info)); ActivityInfo actInfo = ActivityInfo.fromJson(jsonDecode(act.info));
userActivityList userActivityList
.add(ActivityOfUser(actInfo, act.category, act.uuid, act.filename)); .add(ActivityOfUser(actInfo, act.category, act.uuid, act.filename));
} }

@ -41,7 +41,7 @@ class RequestLocal implements IDataStrategy {
jsonList.add(json); jsonList.add(json);
} }
return Tuple2(true, jsonEncode(activities)); return Tuple2(true, jsonList);
} }
@override @override

@ -11,7 +11,7 @@ class User extends ChangeNotifier {
User(); User();
User.create(String username, String email, String token); User.create(this.username, this.email, this.token);
void addActivity(ActivityOfUser activity) { void addActivity(ActivityOfUser activity) {
listActivity.add(activity); listActivity.add(activity);

@ -74,9 +74,10 @@ class ListActivityUtile {
element["filename"].toString())); element["filename"].toString()));
// Save to local db // Save to local db
if (!kIsWeb) if (!kIsWeb) {
localDB.addActivity(element["uuid"], element["filename"], localDB.addActivity(element["uuid"], element["filename"],
element["category"], jsonEncode(element["info"])); element["category"], jsonEncode(element["info"]));
}
} }
return const Tuple2(true, "Yeah"); return const Tuple2(true, "Yeah");
} }

Loading…
Cancel
Save