-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from wryonik/ui-updates
:chore: Start ZKey downloading as soon as webapp is opened
- Loading branch information
Showing
19 changed files
with
1,756 additions
and
1,118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
VITE_CONTRACT_ADDRESS=0x21d42CC2EcDb6db2c3D9b494D8CCcb6674360912 | ||
VITE_CIRCUIT_ARTIFACTS_URL=https://storage.googleapis.com/proof-of-twitter-artifacts/b6ea02e/ | ||
VITE_GOOGLE_CLIENT_ID=274960270901-ciaimkfeslrae1955ghq8bv7n8n3n71f.apps.googleusercontent.com |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
import { useState } from "react"; | ||
import { Button, OutlinedButton } from "./Button"; | ||
|
||
const EmailInputMethod = ({ | ||
onClickGoogle, | ||
onClickEMLFile, | ||
}: { | ||
onClickGoogle: () => void; | ||
onClickEMLFile: () => void; | ||
}) => { | ||
return ( | ||
<div | ||
style={{ | ||
display: "flex", | ||
flexDirection: "column", | ||
justifyContent: "center", | ||
gap: 16, | ||
alignItems: "center", | ||
}} | ||
> | ||
<Button onClick={onClickGoogle}>Sign in with Google</Button> | ||
or | ||
<OutlinedButton | ||
data-testid="upload-email-eml-file-button" | ||
onClick={() => { | ||
onClickEMLFile(); | ||
}} | ||
> | ||
Upload email .eml file{" "} | ||
</OutlinedButton> | ||
</div> | ||
); | ||
}; | ||
|
||
export default EmailInputMethod; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import { createContext } from 'react' | ||
|
||
|
||
interface GoogleAuthValues { | ||
googleAuthToken: any | null; | ||
isGoogleAuthed: boolean; | ||
loggedInGmail: string | null; | ||
scopesApproved: boolean; | ||
googleLogIn: () => void; | ||
googleLogOut: () => void; | ||
} | ||
|
||
const defaultValues: GoogleAuthValues = { | ||
googleAuthToken: null, | ||
isGoogleAuthed: false, | ||
loggedInGmail: null, | ||
scopesApproved: false, | ||
googleLogIn: () => {}, | ||
googleLogOut: () => {}, | ||
}; | ||
|
||
const GoogleAuthContext = createContext<GoogleAuthValues>(defaultValues) | ||
|
||
export default GoogleAuthContext |
127 changes: 127 additions & 0 deletions
127
packages/app/src/contexts/GoogleAuth/GoogleAuthProvider.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
import React, { useEffect, useState, ReactNode } from "react"; | ||
import { | ||
hasGrantedAllScopesGoogle, | ||
useGoogleLogin, | ||
googleLogout, | ||
} from "@react-oauth/google"; | ||
|
||
// import GoogleAuthContext from './GoogleAuthContext' | ||
import { fetchProfile } from "../../hooks/useGmailClient"; | ||
import { esl } from "../../constants"; | ||
import GoogleAuthContext from "./GoogleAuthContext"; | ||
|
||
interface ProvidersProps { | ||
children: ReactNode; | ||
} | ||
|
||
const GoogleAuthProvider = ({ children }: ProvidersProps) => { | ||
/* | ||
* Contexts | ||
*/ | ||
|
||
/* | ||
* State Keys | ||
*/ | ||
|
||
/* | ||
* State | ||
*/ | ||
|
||
const [googleAuthToken, setGoogleAuthToken] = useState<any | null>(); | ||
|
||
const [isGoogleAuthed, setIsGoogleAuthed] = useState<boolean>(false); | ||
const [isScopesApproved, setIsScopesApproved] = useState<boolean>(false); | ||
const [loggedInGmail, setLoggedInGmail] = useState<string | null>(null); | ||
|
||
useEffect(() => { | ||
esl && console.log("googleAuthScopes_1"); | ||
esl && console.log("checking googleAuthToken", googleAuthToken); | ||
|
||
if (googleAuthToken) { | ||
esl && console.log("googleAuthScopes_2"); | ||
|
||
const allScope = hasGrantedAllScopesGoogle( | ||
googleAuthToken, | ||
"email", | ||
"profile", | ||
"https://www.googleapis.com/auth/gmail.readonly" | ||
); | ||
|
||
setIsScopesApproved(allScope); | ||
} | ||
}, [googleAuthToken]); | ||
|
||
useEffect(() => { | ||
esl && console.log("googleProfile_1"); | ||
esl && console.log("checking googleAuthToken", googleAuthToken); | ||
|
||
if (googleAuthToken) { | ||
esl && console.log("googleProfile_2"); | ||
|
||
const fetchData = async () => { | ||
try { | ||
const email = await fetchProfile(googleAuthToken.access_token); | ||
|
||
if (email) { | ||
setLoggedInGmail(email); | ||
|
||
localStorage.setItem("loggedInEmail", email); | ||
} | ||
} catch (error) { | ||
console.error("Error in fetching profile data:", error); | ||
} | ||
}; | ||
|
||
fetchData(); | ||
} | ||
}, [googleAuthToken]); | ||
|
||
/* | ||
* Helpers | ||
*/ | ||
|
||
const googleLogIn = useGoogleLogin({ | ||
onSuccess: (tokenResponse) => { | ||
setGoogleAuthToken(tokenResponse); | ||
setIsGoogleAuthed(true); | ||
|
||
// localStorage.setItem( | ||
// getGoogleAuthTokenKey(), | ||
// JSON.stringify(tokenResponse) | ||
// ); | ||
}, | ||
scope: "email profile https://www.googleapis.com/auth/gmail.readonly", | ||
}); | ||
|
||
const googleLogOut = () => { | ||
setIsScopesApproved(false); | ||
|
||
setGoogleAuthToken(null); | ||
// localStorage.removeItem(getGoogleAuthTokenKey()); | ||
|
||
setIsGoogleAuthed(false); | ||
localStorage.removeItem("isGoogleAuthed"); | ||
|
||
setLoggedInGmail(null); | ||
localStorage.removeItem("loggedInGmail"); | ||
|
||
googleLogout(); | ||
}; | ||
|
||
return ( | ||
<GoogleAuthContext.Provider | ||
value={{ | ||
googleAuthToken, | ||
isGoogleAuthed, | ||
loggedInGmail, | ||
scopesApproved: isScopesApproved, | ||
googleLogIn, | ||
googleLogOut, | ||
}} | ||
> | ||
{children} | ||
</GoogleAuthContext.Provider> | ||
); | ||
}; | ||
|
||
export default GoogleAuthProvider; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export { default as GoogleAuthContext } from './GoogleAuthContext' | ||
export { default as GoogleAuthProvider } from './GoogleAuthProvider' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
export const formatAddress = (address: string | undefined): string => { | ||
if (!address || address.length < 9) { | ||
return address || ''; | ||
} | ||
return `${address.substring(0, 6)}...${address.substring(address.length - 4)}`; | ||
}; | ||
|
||
export const formatAddressLong = (address: string | undefined): string => { | ||
if (!address || address.length < 9) { | ||
return address || ''; | ||
} | ||
return `${address.substring(0, 12)}...${address.substring(address.length - 10)}`; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
export function formatDateTime(unixTimestamp: string): string { | ||
const date = new Date(Number(unixTimestamp)); | ||
const now = new Date(); | ||
|
||
const isToday = | ||
date.getDate() === now.getDate() && | ||
date.getMonth() === now.getMonth() && | ||
date.getFullYear() === now.getFullYear(); | ||
|
||
if (isToday) { | ||
return date.toLocaleTimeString("en-US", { | ||
hour: "numeric", | ||
minute: "2-digit", | ||
hour12: true, | ||
}); | ||
} | ||
return date.toLocaleDateString("en-US", { | ||
month: "numeric", | ||
day: "numeric", | ||
}); | ||
} |
Oops, something went wrong.