diff --git a/ui/.env b/ui/.env index 6281a0125..3ffdb5f88 100644 --- a/ui/.env +++ b/ui/.env @@ -1,9 +1,13 @@ KEYCLOAK_CLIENT_ID="dreams" KEYCLOAK_REALM=plato -DATABASE_URL='postgres://postgres:postgres@localhost:35432/cobudget' - +# DATABASE_URL='postgres://postgres:postgres@localhost:35432/cobudget' SINGLE_GROUP_MODE=false BUCKET_NAME_SINGULAR="bucket" BUCKET_NAME_PLURAL="buckets" PLATFORM_NAME="Cobudget" PLATFORM_LOGO="https://cobudget.com/logo_400.jpg" + +COOKIE_SECRET="A_LONG_RANDOM_VALUE_THAT_IS_NOT_THIS_STRING" +POSTMARK_API_TOKEN="fake" +MAGIC_LINK_SECRET="fake" +FROM_EMAIL="fake@example.com" diff --git a/ui/.env.development b/ui/.env.development index 327f6e71a..be04c48a8 100644 --- a/ui/.env.development +++ b/ui/.env.development @@ -5,7 +5,7 @@ REALITIES_DEPLOY_URL="localhost:2550" REACT_APP_GRAPHQL_ENDPOINT=http://localhost:3100/graphql REACT_APP_GRAPHQL_SUBSCRIPTION=ws://localhost:3100/graphql -DATABASE_URL='postgres://postgres:postgres@localhost:35432/cobudget' +DATABASE_URL='postgresql://postgres:vWDXHXpIZytwF3lF@db.zdderyqdnmrgwrtaefxa.supabase.co:5432/postgres' NEXTAUTH_URL=http://localhost:3000 # For the Discourse integration, don't use these in production diff --git a/ui/components/AuthenticationForm.tsx b/ui/components/AuthenticationForm.tsx index 9ba8903ca..1b0b41f49 100644 --- a/ui/components/AuthenticationForm.tsx +++ b/ui/components/AuthenticationForm.tsx @@ -5,6 +5,7 @@ import TextField from "./TextField"; import Button from "./Button"; import Banner from "components/Banner"; import { FormattedMessage, useIntl } from "react-intl"; +import Web3 from "web3"; export default function AuthenticationForm({ fbEmailError = false, @@ -23,9 +24,11 @@ export default function AuthenticationForm({ const redirect = r?.toString(); const intl = useIntl(); + + return (
-
{ evt.preventDefault(); setLoading(true); @@ -77,14 +80,26 @@ export default function AuthenticationForm({ > - + - {(fbLoginEnabled || googleLoginEnabled) && ( + {(!fbLoginEnabled || googleLoginEnabled) && (
)} - {fbLoginEnabled && ( -
+ { +
+ +
+ } + {!fbLoginEnabled && ( +
{fbEmailError && (
)} - {googleLoginEnabled && ( + {!googleLoginEnabled && (