Merge pull request #29 from daodaoedu/fix/1.2_google_login_url

fix(sign): define BaseUrl and modify style

components/Profile/Edit/Edit.styled.jsx

@@ -15,7 +15,7 @@ export const ContentWrapper = styled.div`
   margin: 0 auto;
   width: 672px;
   @media (max-width: 767px) {
-    width: 80%;
+    width: 100%;
     .title {
       text-overflow: ellipsis;
       width: 100%;

components/Profile/UserTabs/UserTabs.styled.jsx

@@ -42,6 +42,7 @@ export const StyledPanelText = styled(Box)`
     flex-direction: column;
     span {
       margin-left: 0px;
+      place-items: start;
     }
   }
 `;

components/Profile/index.jsx

@@ -89,6 +89,9 @@ const Profile = ({
         sx={{
           position: 'relative',
           mb: '10px',
+          '@media (max-width: 767px)': {
+            width: '100%',
+          },
         }}
       >
         <Button

constants/category.js

@@ -204,11 +204,11 @@ export const NAV_LINK = [
     link: '/search',
     target: '_self',
   },
-  // {
-  //   name: '找夥伴',
-  //   link: '/partner',
-  //   target: '_self',
-  // },
+  {
+    name: '找夥伴',
+    link: '/partner',
+    target: '_self',
+  },
   {
     name: '找活動',
     link: '/activities',

constants/common.js

@@ -0,0 +1,2 @@
+export const BASE_URL =
+  process.env.NEXT_PUBLIC_API_URL || 'https://daodao-server.vercel.app';

pages/login/index.jsx

@@ -8,6 +8,7 @@ import { LazyLoadImage } from 'react-lazy-load-image-component';
 import SEOConfig from '@/shared/components/SEO';
 import Navigation from '@/shared/components/Navigation_v2';
 import Footer from '@/shared/components/Footer_v2';
+import { BASE_URL } from '@/constants/common';
 // import sendDataToChromeExtension from '../../utils/sendDataToChromeExtension';
 
 const HomePageWrapper = styled.div`
@@ -37,10 +38,7 @@ 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 LOGINPATH = `${BASE_URL}/auth/google`;
   const router = useRouter();
 
   const SEOData = useMemo(
@@ -57,11 +55,6 @@ const LoginPage = () => {
     [router?.asPath],
   );
 
-  const onLogin = () => {
-    // toast.success(`歡迎登入！ ${displayName}`);
-    window.open('https://daodao-server.onrender.com/auth/google', '_target');
-  };
-
   return (
     <HomePageWrapper>
       <Script src="https://meet.jit.si/external_api.js" />

pages/profile/index.jsx

@@ -1,7 +1,5 @@
 import React from 'react';
 import styled from '@emotion/styled';
-import { useRouter } from 'next/router';
-import PropTypes from 'prop-types';
 import Tabs from '@mui/material/Tabs';
 import Tab from '@mui/material/Tab';
 import Typography from '@mui/material/Typography';
@@ -65,6 +63,11 @@ const ProfilePage = () => {
           display: 'flex',
           justifyContent: 'center',
           marginTop: '60px',
+          '@media (max-width: 767px)': {
+            flexDirection: 'column',
+            marginTop: '0',
+            padding: '16px',
+          },
         }}
       >
         <Box
@@ -75,6 +78,9 @@ const ProfilePage = () => {
             borderRadius: '8px',
             margin: '26px 40px 0 0',
             padding: '8px',
+            '@media (max-width: 767px)': {
+              width: '100%',
+            },
           }}
         >
           <Tabs

redux/sagas/partnersSaga.js

@@ -1,6 +1,5 @@
 import { put, takeEvery } from 'redux-saga/effects';
-
-const BASEURL = 'https://daodao-server.onrender.com';
+import { BASE_URL } from '@/constants/common';
 
 function* fetchPartnersResource(action) {
   const { pageSize = 10, page = 1, ...rest } = action.payload;
@@ -51,9 +50,8 @@ function* fetchPartnerById(action) {
 
 function* sendEmailToPartner(action) {
   try {
-    const baseUrl = process.env.NEXT_PUBLIC_API_URL || BASEURL;
-    const URL = `${baseUrl}/email`;
-    const result = yield fetch(URL, {
+    const URL = `${BASE_URL}/email`;
+    yield fetch(URL, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',

redux/sagas/user/index.js

@@ -1,6 +1,7 @@
 import { put, all, take, takeEvery, select, call } from 'redux-saga/effects';
 import * as localforage from 'localforage';
 import firebase from '../../../utils/firebase';
+import { BASE_URL } from '@/constants/common';
 
 function* checkUserStatus() {
   try {
@@ -38,8 +39,7 @@ function* userLogin() {
 
 function* fetchAllUsers() {
   try {
-    const URL =
-      process.env.NEXT_PUBLIC_API_URL || 'https://daodao-server.onrender.com';
+    const URL = BASE_URL;
     const result = yield call(URL);
     yield put({ type: 'FETCH_ALL_USER_SUCCESS', payload: result });
   } catch (error) {
@@ -50,9 +50,7 @@ function* fetchAllUsers() {
 function* updateUserProfile(action) {
   const { user } = action.payload;
   try {
-    const baseUri =
-      process.env.NEXT_PUBLIC_API_URL || 'https://daodao-server.onrender.com';
-    const URL = `${baseUri}/user/${user.id}`;
+    const URL = `${BASE_URL}/user/${user.id}`;
 
     const result = yield fetch(URL, {
       method: 'PUT',
@@ -73,9 +71,7 @@ function* updateUserProfile(action) {
 function* fetchUserById(action) {
   const { id } = action.payload;
   try {
-    const baseUrl =
-      process.env.NEXT_PUBLIC_API_URL || 'https://daodao-server.onrender.com';
-    const URL = `${baseUrl}/user/${id}`;
+    const URL = `${BASE_URL}/user/${id}`;
     const result = yield fetch(URL).then((res) => res.json());
     yield put({
       type: 'FETCH_USER_BY_ID_SUCCESS',