From b6c2bff1c614bbb0be076e964944540156a81cfd Mon Sep 17 00:00:00 2001 From: vincent Date: Sun, 9 Apr 2023 22:19:35 +0800 Subject: [PATCH 001/215] update list 1.2.1& 2.2 add list 2.2.1 --- components/Profile/Accountsetting/index.jsx | 108 ++++++++ .../Profile/Contact/ContactDone/index.jsx | 72 +++++ components/Profile/Contact/index.jsx | 246 ++++++++++++++++++ .../Profile/Edit}/index.jsx | 17 +- components/Profile/UserCard/index.jsx | 59 ++++- components/Profile/index.jsx | 49 +++- pages/profile/index.jsx | 99 ++++++- pages/profile/myprofile/index.jsx | 22 ++ pages/signin/interest/index.jsx | 2 +- .../MainNav/SubList/UserAvatar/index.jsx | 6 +- 10 files changed, 657 insertions(+), 23 deletions(-) create mode 100644 components/Profile/Accountsetting/index.jsx create mode 100644 components/Profile/Contact/ContactDone/index.jsx create mode 100644 components/Profile/Contact/index.jsx rename {pages/profile/edit => components/Profile/Edit}/index.jsx (98%) create mode 100644 pages/profile/myprofile/index.jsx diff --git a/components/Profile/Accountsetting/index.jsx b/components/Profile/Accountsetting/index.jsx new file mode 100644 index 00000000..cdddf5f1 --- /dev/null +++ b/components/Profile/Accountsetting/index.jsx @@ -0,0 +1,108 @@ +import React from 'react'; +import { + Box, + Typography, + Checkbox, + Button, + Divider, + FormControlLabel, +} from '@mui/material'; +import { useRouter } from 'next/router'; +import useFirebase from '../../../hooks/useFirebase'; + +const TypographyStyle = { + fontFamily: 'Noto Sans TC', + fontStyle: 'normal', + fontWeight: '500', + fontSize: '16px', + lineHeight: '140%', + color: '#293A3D', +}; + +const AccountSetting = () => { + const { push } = useRouter(); + const { auth, user, signInWithFacebook, signOutWithGoogle } = useFirebase(); + return ( + + + 帳號設定 + + + + 電子信箱 + + + + 電話驗證 + + + + 電子報 + } + label="訂閱電子報與島島阿學的新資訊" + /> + + + + 登出帳號 + + + + + ); +}; + +export default AccountSetting; diff --git a/components/Profile/Contact/ContactDone/index.jsx b/components/Profile/Contact/ContactDone/index.jsx new file mode 100644 index 00000000..cc8be8c0 --- /dev/null +++ b/components/Profile/Contact/ContactDone/index.jsx @@ -0,0 +1,72 @@ +import { Modal, Box, Typography, Button } from '@mui/material'; + +function ContactDoneModal({ onClose, onOk, isLoadingSubmit, open }) { + return ( + + + nobody-land + + 已送出邀請 + + + 請耐心等候夥伴的回應 + + + + + ); +} + +export default ContactDoneModal; diff --git a/components/Profile/Contact/index.jsx b/components/Profile/Contact/index.jsx new file mode 100644 index 00000000..c73086ef --- /dev/null +++ b/components/Profile/Contact/index.jsx @@ -0,0 +1,246 @@ +import { + Modal, + Box, + Typography, + Button, + TextareaAutosize, + Avatar, +} from '@mui/material'; + + +function ContactDoneModal() { + return ( + + + nobody-land + + 已送出邀請 + + + 請耐心等候夥伴的回應 + + + + + ); +} + +function ContactModal({ onClose, onOk, isLoadingSubmit, open }) { + return ( + + + + 聯繫夥伴 + + + + + + + 黃芊宇 + + + 實驗教育學生 + + + + + 邀請訊息 + + + + + 聯繫資訊 + + + + + + + + + + + ); +} + +export default ContactModal; diff --git a/pages/profile/edit/index.jsx b/components/Profile/Edit/index.jsx similarity index 98% rename from pages/profile/edit/index.jsx rename to components/Profile/Edit/index.jsx index 28825561..132c1fc4 100644 --- a/pages/profile/edit/index.jsx +++ b/components/Profile/Edit/index.jsx @@ -47,7 +47,7 @@ import COUNTIES from '../../../constants/countries.json'; const HomePageWrapper = styled.div` --section-height: calc(100vh - 80px); --section-height-offset: 80px; - background: linear-gradient(0deg, #f3fcfc, #f3fcfc), #f7f8fa; + `; const ContentWrapper = styled.div` @@ -55,14 +55,13 @@ const ContentWrapper = styled.div` flex-direction: column; justify-content: center; align-items: center; - background: linear-gradient(0deg, #f3fcfc, #f3fcfc), #f7f8fa; - border-radius: 8px; - margin: 60px auto; + background: white; + border-radius: 16px; + margin: 0 auto; padding: 40px 10px; - max-width: 50%; - width: 100%; + width: 672px; @media (max-width: 767px) { - max-width: 80%; + width: 80%; .title { text-overflow: ellipsis; width: 100%; @@ -193,7 +192,6 @@ function EditPage() { return ( - { - router.push('/profile'); + router.push('/profile/myprofile'); }} > 查看我的頁面 @@ -852,7 +850,6 @@ function EditPage() { -