This commit is contained in:
parent
f51082c463
commit
b4d6b14825
|
@ -71,7 +71,6 @@ import "./custom-bootstrap.scss";
|
||||||
// tslint:disable-next-line: ordered-imports
|
// tslint:disable-next-line: ordered-imports
|
||||||
import "./App.css";
|
import "./App.css";
|
||||||
import classNames from "classnames";
|
import classNames from "classnames";
|
||||||
import { Types as IT } from "@lingdocs/pashto-inflector";
|
|
||||||
import { getTextOptions } from "./lib/get-text-options";
|
import { getTextOptions } from "./lib/get-text-options";
|
||||||
|
|
||||||
// to allow Moustrap key combos even when input fields are in focus
|
// to allow Moustrap key combos even when input fields are in focus
|
||||||
|
@ -264,7 +263,6 @@ class App extends Component<RouteComponentProps, State> {
|
||||||
|
|
||||||
private async handleLoadUser(): Promise<void> {
|
private async handleLoadUser(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
console.log("loading user");
|
|
||||||
const prevUser = this.state.user;
|
const prevUser = this.state.user;
|
||||||
const userOnServer = await getUser();
|
const userOnServer = await getUser();
|
||||||
if (userOnServer === "offline") return;
|
if (userOnServer === "offline") return;
|
||||||
|
@ -275,8 +273,6 @@ class App extends Component<RouteComponentProps, State> {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const { userTextOptionsRecord, serverOptionsAreNewer } = resolveTextOptions(userOnServer, prevUser, this.state.options.textOptionsRecord);
|
const { userTextOptionsRecord, serverOptionsAreNewer } = resolveTextOptions(userOnServer, prevUser, this.state.options.textOptionsRecord);
|
||||||
console.log("resolvedUserTextOptionsRecord", userTextOptionsRecord);
|
|
||||||
console.log("serverRecordIsNewer", serverOptionsAreNewer);
|
|
||||||
const user: AT.LingdocsUser = {
|
const user: AT.LingdocsUser = {
|
||||||
...userOnServer,
|
...userOnServer,
|
||||||
userTextOptionsRecord,
|
userTextOptionsRecord,
|
||||||
|
@ -292,8 +288,7 @@ class App extends Component<RouteComponentProps, State> {
|
||||||
};
|
};
|
||||||
this.handleOptionsUpdate({ type: "updateTextOptionsRecord", payload: textOptionsRecord });
|
this.handleOptionsUpdate({ type: "updateTextOptionsRecord", payload: textOptionsRecord });
|
||||||
if (!serverOptionsAreNewer) {
|
if (!serverOptionsAreNewer) {
|
||||||
console.log("gonna save the new text options");
|
updateUserTextOptionsRecord(userTextOptionsRecord).catch(console.error);
|
||||||
updateUserTextOptionsRecord(userTextOptionsRecord);
|
|
||||||
}
|
}
|
||||||
if (user) {
|
if (user) {
|
||||||
startLocalDbs(user, { wordlist: this.handleRefreshWordlist, reviewTasks: this.handleRefreshReviewTasks });
|
startLocalDbs(user, { wordlist: this.handleRefreshWordlist, reviewTasks: this.handleRefreshReviewTasks });
|
||||||
|
|
Loading…
Reference in New Issue