Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"react-content-loader": "^5.1.4",
"react-dom": "^17.0.1",
"react-draft-wysiwyg": "^1.14.5",
"react-helmet": "^6.1.0",
"react-icons": "^4.1.0",
"react-moment": "^1.0.0",
"react-redux": "^7.2.2",
Expand Down
43 changes: 25 additions & 18 deletions src/containers/introduce/IntroduceHeaderContainer.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React, { useCallback, useState } from 'react';

import { Helmet } from 'react-helmet';

import { useInterval } from 'react-use';
import { useDispatch, useSelector } from 'react-redux';

Expand Down Expand Up @@ -57,24 +59,29 @@ const IntroduceHeaderContainer = () => {
}

return (
<IntroduceHeader group={group}>
<ApplicantViewButton
user={user}
group={group}
realTime={realTime}
applyFields={applyFields}
onApply={onApplyStudy}
onApplyCancel={onApplyCancel}
clearForm={clearApplyForm}
onChangeApplyFields={onChangeApplyFields}
/>
<ModeratorViewButton
user={user}
group={group}
realTime={realTime}
onUpdateConfirm={onUpdateConfirmParticipant}
/>
</IntroduceHeader>
<>
<Helmet>
<title>{group.title}</title>
</Helmet>
<IntroduceHeader group={group}>
<ApplicantViewButton
user={user}
group={group}
realTime={realTime}
applyFields={applyFields}
onApply={onApplyStudy}
onApplyCancel={onApplyCancel}
clearForm={clearApplyForm}
onChangeApplyFields={onChangeApplyFields}
/>
<ModeratorViewButton
user={user}
group={group}
realTime={realTime}
onUpdateConfirm={onUpdateConfirmParticipant}
/>
</IntroduceHeader>
</>
);
};

Expand Down
9 changes: 8 additions & 1 deletion src/pages/LoginPage.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import React from 'react';

import { Helmet } from 'react-helmet';

import LoginFormContainer from '../containers/auth/LoginFormContainer';

const LoginPage = () => (
<LoginFormContainer />
<>
<Helmet>
<title>로그인</title>
</Helmet>
<LoginFormContainer />
</>
);

export default LoginPage;
13 changes: 10 additions & 3 deletions src/pages/MainPage.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
import React from 'react';

import { Helmet } from 'react-helmet';

import Responsive from '../styles/Responsive';

import StudyGroupsContainer from '../containers/groups/StudyGroupsContainer';

const MainPage = () => (
<Responsive>
<StudyGroupsContainer />
</Responsive>
<>
<Helmet>
<title>제목(미정)</title>
</Helmet>
<Responsive>
<StudyGroupsContainer />
</Responsive>
</>
);

export default React.memo(MainPage);
9 changes: 8 additions & 1 deletion src/pages/RegisterPage.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import React from 'react';

import { Helmet } from 'react-helmet';

import RegisterFormContainer from '../containers/auth/RegisterFormContainer';

const RegisterPage = () => (
<RegisterFormContainer />
<>
<Helmet>
<title>회원가입</title>
</Helmet>
<RegisterFormContainer />
</>
);

export default RegisterPage;
20 changes: 14 additions & 6 deletions src/pages/WritePage.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';

import { Helmet } from 'react-helmet';

import styled from '@emotion/styled';

import Responsive from '../styles/Responsive';
Expand All @@ -14,11 +16,17 @@ const WritePageWrapper = styled(Responsive)`
`;

const IntroducePage = () => (
<WritePageWrapper>
<WriteFormContainer />
<WriteEditorContainer />
<TagFormContainer />
<WriteButtonsContainer />
</WritePageWrapper>
<>
<Helmet>
<title>스터디 소개글 작성</title>
</Helmet>
<WritePageWrapper>
<WriteFormContainer />
<WriteEditorContainer />
<TagFormContainer />
<WriteButtonsContainer />
</WritePageWrapper>
</>

);
export default IntroducePage;