diff --git a/packages/app/src/Pages/LoginPage.css b/packages/app/src/Pages/LoginPage.css deleted file mode 100644 index 56090310..00000000 --- a/packages/app/src/Pages/LoginPage.css +++ /dev/null @@ -1,138 +0,0 @@ -.login { - width: 100vw; - height: 100vh; - overflow-x: hidden; - display: flex; - font-weight: 400; - font-size: 14px; - line-height: 24px; -} - -.login p, -.login a { - color: #999999; -} - -.light .login { - color: var(--font-tertiary-color); -} - -.login > div { - flex: 1; - min-width: 0; - margin: 24px; -} - -.login .logo { - margin-top: 16px; - margin-bottom: 50px; -} - -.login > div:nth-child(1) { - display: flex; - justify-content: center; -} - -.login > div:nth-child(1) > .login-container { - width: 403px; -} - -.login > div:nth-child(2) > div.artwork { - background-image: var(--img-src); - width: 100%; - height: 100%; - border-top-left-radius: 50px; - border-bottom-right-radius: 50px; - background-size: cover; - background-position-x: center; - display: flex; - align-items: flex-end; -} - -.login > div:nth-child(2) > div.artwork > .attribution { - margin-left: 25px; - margin-right: 25px; - margin-bottom: 25px; - padding: 4px 12px; - background-color: var(--modal-bg-color); - border-radius: 100px; - color: var(--gray-light); - font-size: 14px; - user-select: none; -} - -.artwork .artist { - background: var(--snort-gradient); - font-weight: 600; - -webkit-background-clip: text; - -webkit-text-fill-color: transparent; - background-clip: text; - text-fill-color: transparent; -} - -.login > div:nth-child(2) > div.artwork .zap-button { - display: inline-block; - color: inherit; - background-color: unset; -} - -@media (max-width: 1024px) { - .login { - width: unset; - height: unset; - } - - .login > div:nth-child(2) { - display: none; - } -} - -.login .login-actions { - margin-top: 32px; -} - -.login .login-actions > button { - margin-right: 10px; - margin-bottom: 10px; -} - -.login .login-or { - font-weight: 400; - font-size: 14px; - line-height: 24px; - margin-top: 40px; - margin-bottom: 40px; -} - -.light .login-or { - color: #a1a1aa; -} - -.login-container input[type="text"] { - border: none; - background-color: var(--gray-secondary); - padding: 12px 16px; - font-size: 16px; -} - -.login-container input[type="password"] { - border: none; - background-color: var(--gray-secondary); - padding: 12px 16px; - font-size: 16px; -} - -.login-container h1 { - color: var(--font-color); - font-style: normal; - font-weight: 700; - font-size: 32px; - line-height: 39px; -} - -.login-container h2 { - color: var(--font-color); - font-weight: 600; - font-size: 16px; - line-height: 19px; -} diff --git a/packages/app/src/Pages/onboarding/moderation.tsx b/packages/app/src/Pages/onboarding/moderation.tsx index c084f8fd..fb667c62 100644 --- a/packages/app/src/Pages/onboarding/moderation.tsx +++ b/packages/app/src/Pages/onboarding/moderation.tsx @@ -177,7 +177,7 @@ export function Moderation() { .filter(([k]) => topics.includes(k)) .map(([, v]) => v.words) .flat() - .concat(extraTerms.split(",").map(a => a.trim())); + .concat(extraTerms.split(",").map(a => a.trim()).filter(a => a.length > 1)); if (words.length > 0) { updateAppData(id, ad => { return { diff --git a/packages/app/src/Pages/onboarding/profile.tsx b/packages/app/src/Pages/onboarding/profile.tsx index 240a5156..f57c928f 100644 --- a/packages/app/src/Pages/onboarding/profile.tsx +++ b/packages/app/src/Pages/onboarding/profile.tsx @@ -7,6 +7,7 @@ import { generateNewLogin } from "Login"; import { SnortContext } from "@snort/system-react"; import { NotEncrypted } from "@snort/system"; import { NewUserState } from "."; +import { trackEvent } from "SnortUtils"; export function Profile() { const system = useContext(SnortContext); @@ -23,7 +24,7 @@ export function Profile() { name: state.name, picture, }); - window.plausible?.("Generate Account"); + trackEvent("Login:NewAccount"); navigate("/login/sign-up/topics"); } catch (e) { if (e instanceof Error) { diff --git a/packages/app/src/Pages/onboarding/start.tsx b/packages/app/src/Pages/onboarding/start.tsx index 412f502b..8fac9be9 100644 --- a/packages/app/src/Pages/onboarding/start.tsx +++ b/packages/app/src/Pages/onboarding/start.tsx @@ -10,6 +10,7 @@ import { LoginSessionType, LoginStore } from "Login"; import useLoginHandler from "Hooks/useLoginHandler"; import { NotEncrypted } from "@snort/system"; import classNames from "classnames"; +import { trackEvent } from "SnortUtils"; export function SignIn() { const navigate = useNavigate(); @@ -21,10 +22,11 @@ export function SignIn() { const hasNip7 = "nostr" in window; async function doNip07Login() { - const relays = - "getRelays" in unwrap(window.nostr) ? await unwrap(window.nostr?.getRelays).call(window.nostr) : undefined; + /*const relays = + "getRelays" in unwrap(window.nostr) ? await unwrap(window.nostr?.getRelays).call(window.nostr) : undefined;*/ const pubKey = await unwrap(window.nostr).getPublicKey(); - LoginStore.loginWithPubkey(pubKey, LoginSessionType.Nip7, relays); + LoginStore.loginWithPubkey(pubKey, LoginSessionType.Nip7); + trackEvent("Login:NIP7"); navigate("/"); } @@ -32,6 +34,8 @@ export function SignIn() { setError(""); try { await loginHandler.doLogin(key, key => Promise.resolve(new NotEncrypted(key))); + + trackEvent("Login:Key"); navigate("/"); } catch (e) { if (e instanceof Error) { diff --git a/packages/app/src/SnortUtils/index.ts b/packages/app/src/SnortUtils/index.ts index d153bc2e..a00a7b9a 100644 --- a/packages/app/src/SnortUtils/index.ts +++ b/packages/app/src/SnortUtils/index.ts @@ -525,3 +525,8 @@ export function getCountry() { lon: Number(lon) / Math.pow(10, lon.length - 3), }; } + + +export function trackEvent(event: string) { + window.plausible?.(event); +} \ No newline at end of file