From 5367accc05f752ece6c8f4cc37129c81996ad38b Mon Sep 17 00:00:00 2001 From: Miodec Date: Thu, 10 Feb 2022 19:38:35 +0100 Subject: [PATCH] fixed 2 circular dependencies part of #2462 --- frontend/src/js/db.js | 2 -- frontend/src/js/pages/account.js | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/js/db.js b/frontend/src/js/db.js index 9ca8d8773..8dfb9d14f 100644 --- a/frontend/src/js/db.js +++ b/frontend/src/js/db.js @@ -1,7 +1,6 @@ import * as AccountButton from "./elements/account-button"; import * as Notifications from "./elements/notifications"; import axiosInstance from "./axios-instance"; -import * as TodayTracker from "./test/today-tracker"; import * as LoadingPage from "./pages/loading"; let dbSnapshot = null; @@ -165,7 +164,6 @@ export async function getUserResults() { return a.timestamp < b.timestamp; }); dbSnapshot.results = results.data; - await TodayTracker.addAllFromToday(); return true; } catch (e) { Notifications.add("Error getting results: " + e.message, -1); diff --git a/frontend/src/js/pages/account.js b/frontend/src/js/pages/account.js index e7c0731bd..fc8a1fc46 100644 --- a/frontend/src/js/pages/account.js +++ b/frontend/src/js/pages/account.js @@ -21,6 +21,7 @@ import * as LoadingPage from "./loading"; import * as Focus from "../test/focus"; import * as SignOutButton from "../account/sign-out-button"; import axiosInstance from "../axios-instance"; +import * as TodayTracker from "./../test/today-tracker"; let filterDebug = false; //toggle filterdebug @@ -1066,6 +1067,7 @@ export function update() { } else if (DB.getSnapshot().results === undefined) { LoadingPage.updateBar(45, true); DB.getUserResults().then((d) => { + TodayTracker.addAllFromToday(); if (d) { ResultFilters.updateActive(); } else {