small bug fixes in frontend (#182)

opencodeiiita · Jun 6, 2023 · 16d8744 · 16d8744 · vercel · Jun 6, 2023
1 parent f66e139
commit 16d8744
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 52 deletions.
diff --git a/components/elements/Appbar/index.js b/components/elements/Appbar/index.js
@@ -39,7 +39,7 @@ export default function index() {
           okText="Yes"
           cancelText="No"
         >
-          <Link onClick={() => router.push('/')}>logout</Link>
+          logout
         </Popconfirm>
       ),
       icon: <BiLogOut />,

diff --git a/components/elements/GoogleOAuth/index.js b/components/elements/GoogleOAuth/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { FcGoogle } from 'react-icons/fc';
 import { get } from '../../utils/API';
 
-export default function GoogleOAuth() {
+export default function GoogleOAuth({ text }) {
   const click = async () => {
     const response = await get('/auth/google');
     window.open(response.data.data.url, '_self');
@@ -18,7 +18,7 @@ export default function GoogleOAuth() {
         <FcGoogle />
       </div>
       <div className="w-full text-left opacity-80 font-inter font-semibold">
-        Sign in with Google
+        {text}
       </div>
     </div>
   );

diff --git a/components/utils/API/index.js b/components/utils/API/index.js
@@ -4,7 +4,8 @@ import { getLS, removeLS } from '../LocalStorage/index';
 const API_URL =
   process.env.NEXT_PUBLIC_ENVIORNMENT === 'prod'
     ? 'https://api.savemyform.tk'
-    : 'https://dev-api.savemyform.tk';
+    : 'http://localhost:8080';
+// : 'https://dev-api.savemyform.tk';
 
 const getAccessToken = () => {
   return getLS('secret');

diff --git a/package-lock.json b/package-lock.json
diff --git a/pages/_app.js b/pages/_app.js
@@ -61,6 +61,7 @@ function MyApp({ Component, pageProps }) {
       <Hydrate state={pageProps.dehydratedState}>
         <GoogleReCaptchaProvider
           reCaptchaKey={'6LcZo3cjAAAAAPEshUhFpjSOLdDaTQEbSoEwwB67'}
+          // reCaptchaKey='1081830613309-46fos7bns3vhlh8qpbvdidm5qvapioob.apps.googleusercontent.com'
           scriptProps={{
             async: false,
             defer: true,

diff --git a/pages/signin/index.js b/pages/signin/index.js
@@ -117,7 +117,7 @@ export default function SignIn() {
             >
               Submit
             </button>
-            <GoogleOAuth />
+            <GoogleOAuth text="Sign In with Google" />
           </form>
         </div>
       </div>

diff --git a/pages/signup/index.js b/pages/signup/index.js
@@ -145,7 +145,7 @@ export default function SignUp() {
             >
               Submit
             </button>
-            <GoogleOAuth />
+            <GoogleOAuth text="Sign Up with Google" />
           </form>
         </div>
       </div>