diff --git a/pages/login/index.jsx b/pages/login/index.jsx index 7a1cba70..bc316af9 100644 --- a/pages/login/index.jsx +++ b/pages/login/index.jsx @@ -1,16 +1,13 @@ -import React, { useEffect, useMemo } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; +import React, { useMemo } from 'react'; import styled from '@emotion/styled'; -import Router, { useRouter } from 'next/router'; +import { useRouter } from 'next/router'; +import Link from '@mui/material/Link'; import Script from 'next/script'; import { Box, Typography, Button, Skeleton } from '@mui/material'; import { LazyLoadImage } from 'react-lazy-load-image-component'; -import toast from 'react-hot-toast'; -import { getAuth, GoogleAuthProvider, signInWithPopup } from 'firebase/auth'; -import { getFirestore, doc, getDoc } from 'firebase/firestore'; -import SEOConfig from '../../shared/components/SEO'; -import Navigation from '../../shared/components/Navigation_v2'; -import Footer from '../../shared/components/Footer_v2'; +import SEOConfig from '@/shared/components/SEO'; +import Navigation from '@/shared/components/Navigation_v2'; +import Footer from '@/shared/components/Footer_v2'; // import sendDataToChromeExtension from '../../utils/sendDataToChromeExtension'; const HomePageWrapper = styled.div` @@ -40,6 +37,10 @@ const ContentWrapper = styled.div` `; const LoginPage = () => { + const BASEURL = `${ + process.env.NEXT_PUBLIC_API_URL || 'https://daodao-server.onrender.com' + }`; + const LOGINPATH = `${BASEURL}/auth/google`; const router = useRouter(); const SEOData = useMemo( @@ -107,23 +108,21 @@ const LoginPage = () => { /> } /> - + + + {`註冊即代表您同意島島阿學的 `} diff --git a/pages/signin/index.jsx b/pages/signin/index.jsx index 4166e2a8..f2dbf4e1 100644 --- a/pages/signin/index.jsx +++ b/pages/signin/index.jsx @@ -110,7 +110,7 @@ function EditPage() { isSubscribeEmail, }; dispatch(updateUser(payload)); - router.push(`/signin/interest?id=${id}`); + router.push(`/signin/interest`); }; const SEOData = useMemo( diff --git a/pages/signin/interest/index.jsx b/pages/signin/interest/index.jsx index 3e2b1da0..092e93aa 100644 --- a/pages/signin/interest/index.jsx +++ b/pages/signin/interest/index.jsx @@ -20,9 +20,8 @@ import { EDUCATION_STEP, WANT_TO_DO_WITH_PARTNER, CATEGORIES, -} from '../../../constants/member'; -import TipModal from '../../../components/Signin/Interest/TipModal'; -import COUNTIES from '../../../constants/countries.json'; +} from '@/constants/member'; +import TipModal from '@/components/Signin/Interest/TipModal'; const HomePageWrapper = styled.div` --section-height: calc(100vh - 80px); @@ -67,10 +66,7 @@ function EditPage() { if (userId) { setInterestList(userInterestList); } - if (id) { - dispatch(fetchUserById(id)); - } - }, [userId, id]); + }, [userId]); const onUpdateUser = (successCallback) => { const payload = {