Alphabetical browsing mode
+ {this.state.user?.level === "editor" &&
{
-
{
}
- {
- this.props.history.replace("/");
- auth.signOut();
- })} />
+
{
isolateEntry={this.handleIsolateEntry}
/>
- {wordlistEnabled(this.state) &&
+ {wordlistEnabled(this.state.user) &&
}
- {this.state.options.level === "editor" &&
+ {this.state.user?.level === "editor" &&
}
- {this.state.options.level === "editor" &&
+ {this.state.user?.level === "editor" &&
}
@@ -534,15 +463,15 @@ class App extends Component {
{
- const res = await tokenFetch("publishDictionary");
- if (!res) {
- throw new Error("Connection error/offline");
+async function accountApiFetch(url: string, method: "GET" | "POST" | "PUT" | "DELETE" = "GET"): Promise {
+ const response = await fetch(accountBaseUrl + url, {
+ method,
+ credentials: "include",
+ });
+ return await response.json() as AT.APIResponse;
+}
+
+export async function publishDictionary(): Promise {
+ return {
+ ok: true,
+ // @ts-ignore
+ info: {},
+ };
+}
+
+export async function upgradeAccount(password: string): Promise {
+ return {
+ ok: false,
+ error: "incorrect password",
+ };
+}
+
+export async function postSubmissions(submissions: FT.SubmissionsRequest): Promise {
+ // return await tokenFetch("submissions", "POST", submissions) as FT.SubmissionsResponse;
+ return {
+ ok: true,
+ message: "received",
+ submissions: [],
}
- return res;
}
-export async function upgradeAccount(password: string): Promise {
- const res = await tokenFetch("upgradeUser", "POST", { password });
- if (!res) {
- throw new Error("Connection error/offline");
- }
- return res;
-}
-
-export async function postSubmissions(submissions: BT.SubmissionsRequest): Promise {
- return await tokenFetch("submissions", "POST", submissions) as BT.SubmissionsResponse;
-}
-
-export async function loadUserInfo(): Promise {
- const res = await tokenFetch("getUserInfo", "GET") as BT.GetUserInfoResponse;
- return "user" in res ? res.user : undefined;
-}
-
-// TODO: HARD TYPING OF THIS WITH THE subUrl and return values etc?
-async function tokenFetch(subUrl: string, method?: "GET" | "POST", body?: any): Promise {
- if (!auth.currentUser) {
- throw new Error("not signed in");
- }
+export async function getUser(): Promise {
try {
- const token = await auth.currentUser.getIdToken();
- const response = await fetch(`${functionsBaseUrl}${subUrl}`, {
- method,
- headers: {
- "Content-Type": "application/json",
- "Authorization": `Bearer ${token}`,
- },
- ...body ? {
- body: JSON.stringify(body),
- } : {},
- });
- return await response.json();
- } catch (err) {
- console.error(err);
- throw err;
+ const response = await accountApiFetch("user");
+ if ("user" in response) {
+ return response.user;
+ }
+ return undefined;
+ } catch (e) {
+ console.error(e);
+ return "offline";
}
}
diff --git a/website/src/lib/firebase.ts b/website/src/lib/firebase.ts
deleted file mode 100644
index 27bf643..0000000
--- a/website/src/lib/firebase.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import firebase from "firebase/app";
-import "firebase/auth";
-
-// Configure Firebase.
-const config = {
- apiKey: "AIzaSyDZrG2BpQi0MGktEKXL6mIWeAYEn_gFacw",
- authDomain: "lingdocs.firebaseapp.com",
- projectId: "lingdocs",
-};
-
-firebase.initializeApp(config);
-
-export const authUiConfig = {
- // Popup signin flow rather than redirect flow.
- signInFlow: "popup",
- signInOptions: [
- firebase.auth.EmailAuthProvider.PROVIDER_ID,
- firebase.auth.GithubAuthProvider.PROVIDER_ID,
- // twitter auth is set up, but not using because it doesn't provide an email
- // firebase.auth.TwitterAuthProvider.PROVIDER_ID,
- // firebase.auth.GoogleAuthProvider.PROVIDER_ID,
- ],
- callbacks: {
- // Avoid redirects after sign-in.
- signInSuccessWithAuthResult: () => false,
- },
-};
-
-export const auth = firebase.auth();
-
diff --git a/website/src/lib/backend-types.ts b/website/src/lib/functions-types.ts
similarity index 73%
rename from website/src/lib/backend-types.ts
rename to website/src/lib/functions-types.ts
index f5d4f34..7f02789 100644
--- a/website/src/lib/backend-types.ts
+++ b/website/src/lib/functions-types.ts
@@ -7,6 +7,7 @@
*/
import { Types as T } from "@lingdocs/pashto-inflector";
+import * as AT from "./account-types";
export type PublishDictionaryResponse = {
ok: true,
@@ -16,20 +17,18 @@ export type PublishDictionaryResponse = {
errors: T.DictionaryEntryError[],
};
-export type UserInfo = {
- uid: string,
- email: string | null,
- displayName: string | null,
-}
-
export type Submission = Edit | ReviewTask;
export type Edit = EntryEdit | NewEntry | EntryDeletion
export type SubmissionBase = {
- sTs: number,
- user: UserInfo,
_id: string,
+ sTs: number,
+ user: {
+ userId: AT.UUID,
+ name: string,
+ email: string,
+ },
}
export type ReviewTask = Issue | EditSuggestion | EntrySuggestion;
@@ -74,30 +73,6 @@ export type SubmissionsResponse = {
submissions: Submission[],
};
-export type UserLevel = "basic" | "student" | "editor";
-
-export type CouchDbUser = {
- _id: string,
- type: "user",
- _rev?: string,
- name: string,
- email: string,
- providerData: any,
- displayName: string,
- roles: [],
- password?: string,
- level: UserLevel,
- userdbPassword: string,
-}
-
-export type GetUserInfoResponse = {
- ok: true,
- message: "no couchdb user found",
-} | {
- ok: true,
- user: CouchDbUser,
-}
-
export type UpgradeUserResponse = {
ok: false,
error: "incorrect password",
diff --git a/website/src/lib/level-management.ts b/website/src/lib/level-management.ts
index da5f632..990a602 100644
--- a/website/src/lib/level-management.ts
+++ b/website/src/lib/level-management.ts
@@ -1,14 +1,6 @@
-/**
- * Copyright (c) 2021 lingdocs.com
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
+import type { LingdocsUser } from "./account-types";
-export function wordlistEnabled(state: State | UserLevel): boolean {
- const level = (typeof state === "string")
- ? state
- : state.options.level;
- return level !== "basic";
-}
+export function wordlistEnabled(user: LingdocsUser | undefined): boolean {
+ if (!user) return false;
+ return user.level !== "basic";
+}
\ No newline at end of file
diff --git a/website/src/lib/options-storage.test.ts b/website/src/lib/local-storage.test.ts
similarity index 96%
rename from website/src/lib/options-storage.test.ts
rename to website/src/lib/local-storage.test.ts
index daf04de..f44fe0b 100644
--- a/website/src/lib/options-storage.test.ts
+++ b/website/src/lib/local-storage.test.ts
@@ -6,7 +6,7 @@
*
*/
-import { saveOptions, readOptions, optionsLocalStorageName } from "./options-storage";
+import { saveOptions, readOptions, optionsLocalStorageName } from "./local-storage";
import {
defaultTextOptions,
} from "@lingdocs/pashto-inflector";
@@ -16,7 +16,6 @@ const optionsStub: Options = {
searchType: "fuzzy",
theme: "dark",
textOptions: defaultTextOptions,
- level: "student",
wordlistMode: "browse",
wordlistReviewLanguage: "Pashto",
wordlistReviewBadge: true,
diff --git a/website/src/lib/options-storage.ts b/website/src/lib/local-storage.ts
similarity index 57%
rename from website/src/lib/options-storage.ts
rename to website/src/lib/local-storage.ts
index 4983dab..8d4182f 100644
--- a/website/src/lib/options-storage.ts
+++ b/website/src/lib/local-storage.ts
@@ -6,7 +6,10 @@
*
*/
+import * as AT from "./account-types";
+
export const optionsLocalStorageName = "options2";
+export const userLocalStorageName = "user1";
export function saveOptions(options: Options): void {
localStorage.setItem(optionsLocalStorageName, JSON.stringify(options));
@@ -31,4 +34,26 @@ export const readOptions = (): Options | undefined => {
console.error("error parsing saved state JSON", e);
return undefined;
}
+};
+
+export function saveUser(user: AT.LingdocsUser | undefined): void {
+ if (user) {
+ localStorage.setItem(userLocalStorageName, JSON.stringify(user));
+ } else {
+ localStorage.removeItem(userLocalStorageName);
+ }
+};
+
+export const readUser = (): AT.LingdocsUser | undefined => {
+ const userRaw = localStorage.getItem(userLocalStorageName);
+ if (!userRaw) {
+ return undefined;
+ }
+ try {
+ const user = JSON.parse(userRaw) as AT.LingdocsUser;
+ return user;
+ } catch (e) {
+ console.error("error parsing saved user JSON", e);
+ return undefined;
+ }
};
\ No newline at end of file
diff --git a/website/src/lib/options-reducer.test.ts b/website/src/lib/options-reducer.test.ts
index c35b5bb..3018fe8 100644
--- a/website/src/lib/options-reducer.test.ts
+++ b/website/src/lib/options-reducer.test.ts
@@ -6,7 +6,6 @@ const options: Options = {
language: "Pashto",
searchType: "fuzzy",
theme: "light",
- level: "basic",
wordlistMode: "browse",
wordlistReviewLanguage: "Pashto",
wordlistReviewBadge: true,
@@ -33,11 +32,6 @@ test("options reducer should work", () => {
...options,
theme: "dark",
});
- expect(optionsReducer(options, { type: "changeUserLevel", payload: "student" }))
- .toEqual({
- ...options,
- level: "student",
- });
expect(optionsReducer(options, { type: "changeWordlistMode", payload: "review" }))
.toEqual({
...options,
@@ -66,12 +60,12 @@ test("options reducer should work", () => {
pTextSize: "largest",
},
});
- expect(optionsReducer(options, { type: "changeSpelling", payload: "Pakistani" }))
+ expect(optionsReducer(options, { type: "changeSpelling", payload: "Pakistani ی" }))
.toEqual({
...options,
textOptions: {
...defaultTextOptions,
- spelling: "Pakistani",
+ spelling: "Pakistani ی",
},
});
expect(optionsReducer(options, { type: "changePhonetics", payload: "ipa" }))
diff --git a/website/src/lib/options-reducer.ts b/website/src/lib/options-reducer.ts
index 61f4e61..faa709d 100644
--- a/website/src/lib/options-reducer.ts
+++ b/website/src/lib/options-reducer.ts
@@ -23,12 +23,6 @@ function optionsReducer(options: Options, action: OptionsAction): Options {
searchBarPosition: action.payload,
};
}
- if (action.type === "changeUserLevel") {
- return {
- ...options,
- level: action.payload,
- };
- }
if (action.type === "changeWordlistMode") {
return {
...options,
diff --git a/website/src/lib/pouch-dbs.ts b/website/src/lib/pouch-dbs.ts
index 3de1438..311d6d0 100644
--- a/website/src/lib/pouch-dbs.ts
+++ b/website/src/lib/pouch-dbs.ts
@@ -1,75 +1,112 @@
import PouchDB from "pouchdb";
-import * as BT from "./backend-types";
+import * as AT from "./account-types";
+import * as FT from "./functions-types";
type LocalDbType = "submissions" | "wordlist" | "reviewTasks";
-type LocalDb = null | { refresh: () => void, db: PouchDB.Database };
+
+const localDbTypes: LocalDbType[] = ["submissions", "wordlist", "reviewTasks"];
+
+type UnsyncedLocalDb = {
+ refresh: () => void,
+ db: PouchDB.Database,
+};
+
+type SyncedLocalDb = UnsyncedLocalDb & {
+ sync: PouchDB.Replication.Sync,
+};
+
+type DBS = {
+ submissions: undefined | UnsyncedLocalDb,
+ wordlist: undefined | SyncedLocalDb,
+ reviewTasks: undefined | SyncedLocalDb,
+};
+
type DbInput = {
type: "wordlist",
doc: WordlistWord,
} | {
type: "submissions",
- doc: BT.Submission,
+ doc: FT.Submission,
} | {
type: "reviewTasks",
- doc: BT.ReviewTask,
+ doc: FT.ReviewTask,
};
-const dbs: Record = {
+const dbs: DBS = {
/* for anyone logged in - for edits/suggestions submissions */
- submissions: null,
+ submissions: undefined,
/* for students and above - personal wordlist database */
- wordlist: null,
+ wordlist: undefined,
/* for editors only - edits/suggestions (submissions) for review */
- reviewTasks: null,
+ reviewTasks: undefined,
};
-export function initializeLocalDb(type: LocalDbType, refresh: () => void, uid?: string | undefined) {
+export function startLocalDbs(user: AT.LingdocsUser, refreshFns: { wordlist: () => void, reviewTasks: () => void }) {
+ if (user.level === "basic") {
+ initializeLocalDb("submissions", () => null, user);
+ }
+ if (user.level === "student") {
+ initializeLocalDb("submissions", () => null, user);
+ initializeLocalDb("wordlist", refreshFns.wordlist, user);
+ }
+ if (user.level === "editor") {
+ deInitializeLocalDb("submissions");
+ initializeLocalDb("reviewTasks", refreshFns.reviewTasks, user);
+ initializeLocalDb("wordlist", refreshFns.wordlist, user);
+ }
+}
+
+function deInitializeLocalDb(type: LocalDbType) {
+ const db = dbs[type];
+ if (db && "sync" in db) {
+ db.sync.cancel();
+ }
+ dbs[type] = undefined;
+}
+
+export function stopLocalDbs() {
+ localDbTypes.forEach((type) => {
+ deInitializeLocalDb(type);
+ });
+}
+
+function initializeLocalDb(type: LocalDbType, refresh: () => void, user: AT.LingdocsUser) {
const name = type === "wordlist"
- ? `userdb-${uid? stringToHex(uid) : "guest"}`
+ ? `userdb-${stringToHex(user.userId)}`
: type === "submissions"
? "submissions"
: "review-tasks";
const db = dbs[type];
// only initialize the db if it doesn't exist or if it has a different name
if ((!db) || (db.db?.name !== name)) {
- dbs[type] = {
- db: new PouchDB(name),
- refresh,
- };
+ if (type === "submissions") {
+ dbs[type] = {
+ refresh,
+ db: new PouchDB(name),
+ };
+ } else {
+ dbs[type]?.sync.cancel();
+ const db = new PouchDB(name);
+ const pass = "userDbPassword" in user ? user.userDbPassword : "";
+ dbs[type] = {
+ db,
+ refresh,
+ sync: db.sync(
+ `https://${user.userId}:${pass}@couch.lingdocs.com/${name}`,
+ { live: true, retry: true },
+ ).on("change", (info) => {
+ if (info.direction === "pull") {
+ refresh();
+ }
+ }).on("error", (error) => {
+ console.error(error);
+ }),
+ };
+ }
refresh();
}
}
-export function getLocalDbName(type: LocalDbType) {
- return dbs[type]?.db.name;
-}
-
-export function deInitializeLocalDb(type: LocalDbType) {
- dbs[type] = null;
-}
-
-export function startLocalDbSync(
- type: "wordlist" | "reviewTasks",
- auth: { name: string, password: string },
-) {
- const localDb = dbs[type];
- if (!localDb) {
- console.error(`unable to start sync because ${type} database is not initialized`);
- return;
- }
- const sync = localDb.db.sync(
- `https://${auth.name}:${auth.password}@couchdb.lingdocs.com/${localDb.db.name}`,
- { live: true, retry: true },
- ).on("change", (info) => {
- if (info.direction === "pull") {
- localDb.refresh();
- }
- }).on("error", (error) => {
- console.error(error);
- });
- return sync;
-}
-
export async function addToLocalDb({ type, doc }: DbInput) {
const localDb = dbs[type];
if (!localDb) {
@@ -99,10 +136,10 @@ export async function updateLocalDbDoc({ type, doc }: DbInput, id: string) {
return updated;
}
-export async function getAllDocsLocalDb(type: "submissions", limit?: number): Promise;
+export async function getAllDocsLocalDb(type: "submissions", limit?: number): Promise;
export async function getAllDocsLocalDb(type: "wordlist", limit?: number): Promise;
-export async function getAllDocsLocalDb(type: "reviewTasks", limit?: number): Promise
-export async function getAllDocsLocalDb(type: LocalDbType, limit?: number): Promise {
+export async function getAllDocsLocalDb(type: "reviewTasks", limit?: number): Promise
+export async function getAllDocsLocalDb(type: LocalDbType, limit?: number): Promise {
const localDb = dbs[type];
if (!localDb) {
throw new Error(`unable to get all docs from ${type} database - not initialized`);
@@ -116,11 +153,11 @@ export async function getAllDocsLocalDb(type: LocalDbType, limit?: number): Prom
const docs = result.rows.map((row) => row.doc) as unknown;
switch (type) {
case "submissions":
- return docs as BT.Submission[];
+ return docs as FT.Submission[];
case "wordlist":
return docs as WordlistWordDoc[];
case "reviewTasks":
- return docs as BT.ReviewTask[];
+ return docs as FT.ReviewTask[];
}
}
diff --git a/website/src/lib/search-all-inflections.ts b/website/src/lib/search-all-inflections.ts
index 91db554..e39face 100644
--- a/website/src/lib/search-all-inflections.ts
+++ b/website/src/lib/search-all-inflections.ts
@@ -28,7 +28,7 @@ function fFuzzy(f: string): string {
}
export function searchAllInflections(allDocs: T.DictionaryEntry[], searchValue: string): { entry: T.DictionaryEntry, results: InflectionSearchResult[] }[] {
- const timerLabel = "Search inflections";
+ // const timerLabel = "Search inflections";
const beg = fFuzzy(searchValue.slice(0, 2));
const preSearchFun = isPashtoScript(searchValue)
? (ps: T.PsString) => ps.p.slice(0, 2) === beg
@@ -37,7 +37,7 @@ export function searchAllInflections(allDocs: T.DictionaryEntry[], searchValue:
const searchFun = isPashtoScript(searchValue)
? (ps: T.PsString) => ps.p === searchValue
: (ps: T.PsString) => !!ps.f.match(fRegex);
- console.time(timerLabel);
+ // console.time(timerLabel);
const results = allDocs.reduce((all: { entry: T.DictionaryEntry, results: InflectionSearchResult[] }[], entry) => {
const type = isNounAdjOrVerb(entry);
if (entry.c && type === "verb") {
@@ -74,6 +74,6 @@ export function searchAllInflections(allDocs: T.DictionaryEntry[], searchValue:
}
return all;
}, []);
- console.timeEnd(timerLabel);
+ // console.timeEnd(timerLabel);
return results;
}
\ No newline at end of file
diff --git a/website/src/lib/submissions.ts b/website/src/lib/submissions.ts
index 3bcd086..8b1eb86 100644
--- a/website/src/lib/submissions.ts
+++ b/website/src/lib/submissions.ts
@@ -1,28 +1,22 @@
-import * as BT from "./backend-types";
-import { auth } from "./firebase";
+import * as FT from "./functions-types";
+import * as AT from "./account-types";
import {
postSubmissions,
} from "./backend-calls";
import {
- initializeLocalDb,
addToLocalDb,
getAllDocsLocalDb,
deleteFromLocalDb,
} from "./pouch-dbs";
-initializeLocalDb("submissions", () => null);
-
-export function submissionBase(): BT.SubmissionBase {
- if (!auth.currentUser) {
- throw new Error("not signed in");
- }
+export function submissionBase(user: AT.LingdocsUser): FT.SubmissionBase {
return {
sTs: Date.now(),
_id: new Date().toJSON(),
user: {
- uid: auth.currentUser.uid,
- email: auth.currentUser.email,
- displayName: auth.currentUser.displayName,
+ name: user.name,
+ email: user.email || "",
+ userId: user.userId,
},
};
}
@@ -48,8 +42,8 @@ export async function sendSubmissions() {
}
}
-export async function addSubmission(submission: BT.Submission, level: BT.UserLevel) {
- if (level === "editor" && (submission.type === "issue" || submission.type === "entry suggestion" || submission.type === "edit suggestion")) {
+export async function addSubmission(submission: FT.Submission, user: AT.LingdocsUser) {
+ if (user.level === "editor" && (submission.type === "issue" || submission.type === "entry suggestion" || submission.type === "edit suggestion")) {
await addToLocalDb({ type: "reviewTasks", doc: submission })
} else {
await addToLocalDb({ type: "submissions", doc: submission });
diff --git a/website/src/screens/Account.tsx b/website/src/screens/Account.tsx
index 2e4fa71..d817b74 100644
--- a/website/src/screens/Account.tsx
+++ b/website/src/screens/Account.tsx
@@ -1,89 +1,54 @@
-import { useState, useEffect } from "react";
-import { Modal, Button } from "react-bootstrap";
-import { Link } from "react-router-dom";
-import { auth, authUiConfig } from "../lib/firebase";
-import StyledFirebaseAuth from "react-firebaseui/StyledFirebaseAuth";
import {
- upgradeAccount,
+ useState,
+ // useEffect,
+} from "react";
+// import { Modal, Button } from "react-bootstrap";
+import {
+ // upgradeAccount,
publishDictionary,
} from "../lib/backend-calls";
-import LoadingElipses from "../components/LoadingElipses";
+// import LoadingElipses from "../components/LoadingElipses";
import { Helmet } from "react-helmet";
+import * as AT from "../lib/account-types";
const capitalize = (s: string): string => {
// if (!s) return "";
return s.charAt(0).toUpperCase() + s.slice(1);
}
-const Account = ({ handleSignOut, level, loadUserInfo }: {
- handleSignOut: () => void,
- loadUserInfo: () => void,
- level: UserLevel,
-}) => {
- const [showingDeleteConfirmation, setShowingDeleteConfirmation] = useState(false);
- const [showingUpgradePrompt, setShowingUpgradePrompt] = useState(false);
- const [upgradePassword, setUpgradePassword] = useState("");
- const [upgradeError, setUpgradeError] = useState("");
- const [accountDeleted, setAccountDeleted] = useState(false);
- const [accountDeleteError, setAccountDeleteError] = useState("");
- const [emailVerification, setEmailVerification] = useState<"unverified" | "sent" | "verified">("verified");
- const [waiting, setWaiting] = useState(false);
+const Account = ({ user }: { user: AT.LingdocsUser | undefined }) => {
+ // const [showingUpgradePrompt, setShowingUpgradePrompt] = useState(false);
+ // const [upgradePassword, setUpgradePassword] = useState("");
+ // const [upgradeError, setUpgradeError] = useState("");
+ // const [waiting, setWaiting] = useState(false);
const [publishingStatus, setPublishingStatus] = useState(undefined);
- const [showingPasswordChange, setShowingPasswordChange] = useState(false);
- const [password, setPassword] = useState("");
- const [passwordConfirmed, setPasswordConfirmed] = useState("");
- const [passwordError, setPasswordError] = useState("");
- const [showingUpdateEmail, setShowingUpdateEmail] = useState(false);
- const [updateEmailError, setUpdateEmailError] = useState("");
- const [newEmail, setNewEmail] = useState("");
- const user = auth.currentUser;
- const hasPasswordProvider = user?.providerData?.some((d) => d?.providerId === "password");
- useEffect(() => {
- setShowingDeleteConfirmation(false);
- setShowingUpgradePrompt(false);
- setUpgradePassword("");
- setUpgradeError("");
- setWaiting(false);
- }, []);
- useEffect(() => {
- setEmailVerification((user && user.emailVerified) ? "verified" : "unverified");
- }, [user]);
- function handleDelete() {
- auth.currentUser?.delete().then(() => {
- setAccountDeleteError("");
- setShowingDeleteConfirmation(false);
- setAccountDeleted(true);
- }).catch((err) => {
- console.error(err);
- setAccountDeleteError(err.message);
- });
- }
- function closeUpgrade() {
- setShowingUpgradePrompt(false);
- setUpgradePassword("");
- setUpgradeError("");
- }
- function closeUpdateEmail() {
- setShowingUpdateEmail(false);
- setNewEmail("");
- setUpdateEmailError("");
- }
- async function handleUpgrade() {
- setUpgradeError("");
- setWaiting(true);
- upgradeAccount(upgradePassword).then((res) => {
- setWaiting(false);
- if (res.ok) {
- loadUserInfo();
- closeUpgrade();
- } else {
- setUpgradeError("Incorrect password");
- }
- }).catch((err) => {
- setWaiting(false);
- setUpgradeError(err.message);
- });
- }
+ // useEffect(() => {
+ // setShowingUpgradePrompt(false);
+ // setUpgradePassword("");
+ // setUpgradeError("");
+ // setWaiting(false);
+ // }, []);
+ // function closeUpgrade() {
+ // setShowingUpgradePrompt(false);
+ // setUpgradePassword("");
+ // setUpgradeError("");
+ // }
+ // async function handleUpgrade() {
+ // setUpgradeError("");
+ // setWaiting(true);
+ // upgradeAccount(upgradePassword).then((res) => {
+ // setWaiting(false);
+ // if (res.ok) {
+ // loadUserInfo();
+ // closeUpgrade();
+ // } else {
+ // setUpgradeError("Incorrect password");
+ // }
+ // }).catch((err) => {
+ // setWaiting(false);
+ // setUpgradeError(err.message);
+ // });
+ // }
function handlePublish() {
setPublishingStatus("publishing");
publishDictionary().then((response) => {
@@ -93,56 +58,6 @@ const Account = ({ handleSignOut, level, loadUserInfo }: {
setPublishingStatus("Offline or connection error");
});
}
- function handleVerifyEmail() {
- if (!user) return;
- user.sendEmailVerification();
- setEmailVerification("sent");
- }
- function handleUpdateEmail() {
- if (!user) return;
- user.updateEmail(newEmail).then(() => {
- setShowingUpdateEmail(false);
- }).catch((err) => {
- setUpdateEmailError(err.message);
- });
- }
- function closePasswordChange() {
- setShowingPasswordChange(false);
- setPassword("");
- setPasswordConfirmed("");
- }
- function handlePasswordChange() {
- if (!user) return;
- if (password === "") {
- setPasswordError("Please enter a password");
- return;
- }
- if (password !== passwordConfirmed) {
- setPasswordError("Your passwords do not match");
- return;
- }
- user.updatePassword(password).then(() => {
- closePasswordChange();
- }).catch((err) => {
- setPasswordError(err.message);
- });
- }
- if (accountDeleted) {
- return
@@ -151,23 +66,8 @@ const Account = ({ handleSignOut, level, loadUserInfo }: {
Sign In - LingDocs Pashto Dictionary
{
- // const newUser = res.additionalUserInfo?.isNewUser;
- // const emailVerified = res.user.emailVerified;
- // if (newUser && !emailVerified) {
- // res.user.sendEmailVerification();
- // setEmailVerification("sent");
- // }
- // return false;
- // }}
- firebaseAuth={auth} />
- ;
+
}
- const defaultProviderId = user.providerData[0]?.providerId;
return (
@@ -176,7 +76,7 @@ const Account = ({ handleSignOut, level, loadUserInfo }: {
Account - LingDocs Pashto Dictionary
}
- - setShowingDeleteConfirmation(false)}>
-
- Delete Account?
-
- Are your sure you want to delete your account? This can't be undone.
- {accountDeleteError &&
-
-
-
-
-
+ */}
+ {/*
Upgrade Account
@@ -318,85 +163,7 @@ const Account = ({ handleSignOut, level, loadUserInfo }: {
Upgrade my account
-
-
-
- {hasPasswordProvider ? "Change" : "Add"} Password
-
- {!hasPasswordProvider &&
- You can create a password here if you would like to sign in with your email and password, instead of just signing in with {defaultProviderId}.
- }
-
- {waiting &&
-
-
-
- Update Email
-
-
- {waiting &&
-
+ */}
);
};
diff --git a/website/src/screens/EntryEditor.tsx b/website/src/screens/EntryEditor.tsx
index 619dec3..6dafe6f 100644
--- a/website/src/screens/EntryEditor.tsx
+++ b/website/src/screens/EntryEditor.tsx
@@ -18,7 +18,7 @@ import {
validateEntry,
} from "@lingdocs/pashto-inflector";
import Entry from "../components/Entry";
-import * as BT from "../lib/backend-types";
+import * as FT from "../lib/functions-types";
import {
submissionBase,
addSubmission,
@@ -136,18 +136,20 @@ function EntryEditor({ state, dictionary, searchParams }: {
}
}
function handleDelete() {
- const submission: BT.EntryDeletion = {
- ...submissionBase(),
+ if (!state.user) return;
+ const submission: FT.EntryDeletion = {
+ ...submissionBase(state.user),
type: "entry deletion",
ts: entry.ts,
};
- addSubmission(submission, state.options.level);
+ addSubmission(submission, state.user);
setDeleted(true);
}
function handleSubmit(e: any) {
setErroneousFields([]);
setErrors([]);
e.preventDefault();
+ if (!state.user) return;
const result = validateEntry(entry);
if ("errors" in result) {
setErroneousFields(result.erroneousFields);
@@ -155,12 +157,12 @@ function EntryEditor({ state, dictionary, searchParams }: {
return;
}
// TODO: Check complement if checkComplement
- const submission: BT.NewEntry | BT.EntryEdit = {
- ...submissionBase(),
+ const submission: FT.NewEntry | FT.EntryEdit = {
+ ...submissionBase(state.user),
type: entry.ts === 1 ? "new entry" : "entry edit",
entry: { ...entry, ts: entry.ts === 1 ? Date.now() : entry.ts },
};
- addSubmission(submission, state.options.level);
+ addSubmission(submission, state.user);
setSubmitted(true);
// TODO: Remove from suggestions
// if (willDeleteSuggestion && sTs) {
@@ -306,8 +308,8 @@ function EntryEditor({ state, dictionary, searchParams }: {
))}
Editor priveleges active
@@ -478,7 +410,7 @@ class App extends Component
-
-
- Account Deleted - LingDocs Pashto Dictionary
-
-
- }
if (!user) {
return
-
-
-
-
- Your account has been deleted 🙋♂️
-Sign in to be able to suggest words/edits
-For people who previously signed in with Google. Sorry, there is a problem now and you can't get to your previous account! 😬 Don't worry, all your info is safe and it will be restored in the near future. Stay tuned.
-Account
- {level === "editor" && + {user.level === "editor" &&Editor Tools
{publishingStatus !== "publishing" && @@ -197,44 +97,34 @@ const Account = ({ handleSignOut, level, loadUserInfo }: {
- {user.photoURL &&
-
+ */}
+ {/* {user.p &&
- }
+
} */}
-
-
- Name: {user.displayName} +
- Name: {user.name}
-
{user.email && }-Email: {user.email} - {emailVerification === "unverified" && } -- {emailVerification === "unverified" &&- Please Verify Your Email Address -} - {emailVerification === "sent" &&- 📧 Check your email for the confirmation message -} +Email: {user.email}
-
- Account Level: {capitalize(level)} +
- Account Level: {capitalize(user.level)}
Account Admin
-
- {level === "basic" &&
- - -
-
}
- - {accountDeleteError} -
- -
-
- {
- setPassword(e.target.value);
- setPasswordError("");
- }}
- />
-
- {
- setPasswordConfirmed(e.target.value);
- setPasswordError("");
- }}
- />
-
- {passwordError &&
-
}
- - {passwordError} -
-
-
- {
- setNewEmail(e.target.value);
- setUpdateEmailError("");
- }}
- />
-
- {updateEmailError &&
-
}
- - {updateEmailError} -
-
-
-
+
+
{sTs &&
w.entry.ts === state.isolatedEntry?.ts);
function submitEdit() {
if (!state.isolatedEntry) return;
+ if (!state.user) return;
addSubmission({
- ...submissionBase(),
+ ...submissionBase(state.user),
type: "edit suggestion",
entry: state.isolatedEntry,
comment,
- }, state.options.level);
+ }, state.user);
setEditing(false);
setComment("");
setEditSubmitted(true);
@@ -108,10 +106,10 @@ function IsolatedEntry({ state, dictionary, isolateEntry }: {
isolateEntry={isolateEntry}
/>
- {auth.currentUser &&
+ {state.user &&
- {state.options.level === "editor" &&
+ {state.user.level === "editor" &&
- {wordlistEnabled(state) &&
void,
}) {
return
@@ -152,7 +154,7 @@ function Options({
ctrl / ⌘ + b
clear search
- {wordlistEnabled(options.level) &&
+ {wordlistEnabled(state.user) &&
ctrl / ⌘ + \
show/hide wordlist
}
@@ -173,7 +175,7 @@ function Options({
handleChange={(p) => optionsDispatch({ type: "changeSearchBarPosition", payload: p as SearchBarPosition })}
/>
) {
event.preventDefault();
+ if (!state.user) return;
const p = pashto;
const f = phonetics;
const e = english;
- const newEntry: BT.EntrySuggestion = {
- ...submissionBase(),
+ const newEntry: FT.EntrySuggestion = {
+ ...submissionBase(state.user),
type: "entry suggestion",
entry: { ts: 0, i: 0, p, f, g: "", e },
comment,
};
- addSubmission(newEntry, state.options.level);
+ addSubmission(newEntry, state.user);
setSuggestionState("received");
}
function handlePowerSearch() {
@@ -91,16 +91,16 @@ function Results({ state, isolateEntry }: {
LingDocs Pashto Dictionary
- {(auth.currentUser && (window.location.pathname !== "/word") && suggestionState === "none" && powerResults === undefined) && }
{(powerResults === undefined && suggestionState === "none" && window.location.pathname === "/search") &&
Bottom position doesn't work well with iPhones.
- {wordlistEnabled(options.level) && <>
+ {wordlistEnabled(state.user) && <>