mirror of
https://github.com/monkeytypegame/monkeytype.git
synced 2025-11-24 10:30:07 +08:00
more status updates on loading
This commit is contained in:
parent
d81c232d85
commit
c09078b102
2 changed files with 5 additions and 5 deletions
|
|
@ -31,7 +31,6 @@ export function toggleFilterDebug() {
|
|||
|
||||
export async function getDataAndInit() {
|
||||
try {
|
||||
$(".pageLoading .text").text("Downloading user data...");
|
||||
console.log("getting account data");
|
||||
await DB.initSnapshot();
|
||||
} catch (e) {
|
||||
|
|
@ -57,6 +56,7 @@ export async function getDataAndInit() {
|
|||
AccountController.signOut();
|
||||
return;
|
||||
}
|
||||
$(".pageLoading .text").text("Applying settings...");
|
||||
let snap = DB.getSnapshot();
|
||||
$("#menu .icon-button.account .text").text(snap.name);
|
||||
// if (snap === null) {
|
||||
|
|
@ -134,7 +134,6 @@ export async function getDataAndInit() {
|
|||
}
|
||||
// if($(".pageAccount").hasClass('active')) update();
|
||||
// if ($(".pageLogin").hasClass("active")) UI.changePage("account");
|
||||
$(".pageLoading .text").text("Applying settings...");
|
||||
if (!UpdateConfig.changedBeforeDb) {
|
||||
//config didnt change before db loaded
|
||||
if (Config.localStorageConfig === null) {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ export async function initSnapshot() {
|
|||
let snap = defaultSnap;
|
||||
try {
|
||||
if (firebase.auth().currentUser == null) return false;
|
||||
$(".pageLoading .text").text("Downloading data...");
|
||||
let userData = await axiosInstance.get("/user");
|
||||
userData = userData.data;
|
||||
snap.name = userData.name;
|
||||
|
|
@ -74,13 +75,13 @@ export async function initSnapshot() {
|
|||
} else if (userData.lbMemory) {
|
||||
snap.lbMemory = userData.lbMemory;
|
||||
}
|
||||
|
||||
$(".pageLoading .text").text("Downloading config...");
|
||||
let configData = await axiosInstance.get("/config");
|
||||
configData = configData.data;
|
||||
if (configData) {
|
||||
snap.config = configData.config;
|
||||
}
|
||||
|
||||
$(".pageLoading .text").text("Downloading tags...");
|
||||
let tagsData = await axiosInstance.get("/user/tags");
|
||||
snap.tags = tagsData.data;
|
||||
snap.tags = snap.tags.sort((a, b) => {
|
||||
|
|
@ -92,7 +93,7 @@ export async function initSnapshot() {
|
|||
return 0;
|
||||
}
|
||||
});
|
||||
|
||||
$(".pageLoading .text").text("Downloading presets...");
|
||||
let presetsData = await axiosInstance.get("/presets");
|
||||
snap.presets = presetsData.data;
|
||||
snap.presets = snap.presets.sort((a, b) => {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue