Merge pull request #190 from waldo-vision/ts/fix

enable google oauth and rollback commits.
waldo-vision · Mar 27, 2023 · 7e2749c · 7e2749c
2 parents e7e75f0 + 61d7264
commit 7e2749c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/apps/web/components/TurnstileWidget.tsx b/apps/web/components/TurnstileWidget.tsx
@@ -17,6 +17,8 @@ const TurnstileWidget = (props: WidgetProps) => {
     if (props.refreshState > 0) {
       //@ts-ignore
       ref.current?.reset();
+      //@ts-ignore
+      ref.current?.render();
     }
   }, [props.refreshState]);
   const handleCallback = async (token: string, state: CallbackStates) => {

diff --git a/apps/web/pages/auth/login.tsx b/apps/web/pages/auth/login.tsx
@@ -70,12 +70,7 @@ export default function Login() {
 
   const handleSelect = (index: number) => {
     if (!authProviders) return;
-    if (authProviders[index].provider == 'Google') {
-      const errorMsg =
-        "Currently Google signin is disabled, we're working on it!";
-      createErrorToast(errorMsg);
-      return;
-    }
+
     setCurrentProvider(authProviders[index].provider.toLowerCase());
     if (
       userSession?.user?.provider.toLocaleLowerCase() ==
@@ -234,14 +229,7 @@ export default function Login() {
                     boxShadow={'lg'}
                     borderRadius={8}
                     h={24}
-                    cursor={provider == 'Google' ? 'not-allowed' : ''}
-                    bgColor={
-                      provider == 'Google'
-                        ? '#a3a6ab'
-                        : selected
-                        ? 'black'
-                        : 'white'
-                    }
+                    bgColor={selected ? 'black' : 'white'}
                   >
                     <Flex direction={'row'}>
                       <Center h={24}>

diff --git a/apps/web/pages/submissions/review.tsx b/apps/web/pages/submissions/review.tsx
@@ -114,10 +114,6 @@ export default function Review() {
   };
 
   useEffect(() => {
-    if (tsToken && reviewItemData) {
-      setLoading(false);
-      return;
-    }
     const getNecessaryData = async () => {
       if (tsToken && tsToken.length > 3 && !reviewItemData) {
         await refetch();