Skip to content

Commit

Permalink
Merge pull request #137 from daodaoedu/v2
Browse files Browse the repository at this point in the history
fix(auth): ensure login page stores info correctly in redux
  • Loading branch information
JohnsonMao authored Nov 21, 2024
2 parents e3af08f + 464e1c5 commit c140090
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 483 deletions.
6 changes: 4 additions & 2 deletions components/Group/detail/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Box from '@mui/material/Box';
import Skeleton from '@mui/material/Skeleton';
import ArrowBackIosNewIcon from '@mui/icons-material/ArrowBackIosNew';
import Image from '@/shared/components/Image';
import ContactButton from '@/shared/components/ContactButton';
import { StyledStatus } from '../GroupList/GroupCard.styled';
import StyledPaper from '../Paper.styled';
import TeamInfoCard from './TeamInfoCard';
Expand All @@ -17,7 +18,6 @@ import {
StyledDesktopEditButton,
StyledMobileEditButton,
} from './Detail.styled';
import ContactButton from './Contact';
import ShareButtonGroup from './ShareButtonGroup';

function GroupDetail({ id, source, isLoading }) {
Expand Down Expand Up @@ -101,9 +101,11 @@ function GroupDetail({ id, source, isLoading }) {
<ContactButton
user={source?.user || {}}
activityTitle={source?.title}
label="聯繫主揪"
dialogTitle="聯繫主揪"
description="想跟主揪說的話"
descriptionPlaceholder="想參加主揪的團體嗎?可以簡單的自我介紹,寫下想加入的原因。"
emailTitle="你發起的揪團有人來信!"
emailSubject="【島島阿學】點開 Email,揪團有新消息"
/>
)}
</Box>
Expand Down
81 changes: 0 additions & 81 deletions components/Profile/Contact/ContactDone/index.jsx

This file was deleted.

66 changes: 0 additions & 66 deletions components/Profile/Contact/ContactError/index.jsx

This file was deleted.

195 changes: 0 additions & 195 deletions components/Profile/Contact/index.jsx

This file was deleted.

Loading

0 comments on commit c140090

Please sign in to comment.