Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

전체서비스 페이지에 근처게스트모집, 추천크루 탭 추가 #464

Merged
merged 3 commits into from
Dec 3, 2023
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
3 changes: 3 additions & 0 deletions src/assets/foot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/pages/AllServicesPage/AllServicesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ import Chat from '@assets/chat.svg?react';
import CrewManage from '@assets/crewManage.svg?react';
import CrewMember from '@assets/crewMember.svg?react';
import Exit from '@assets/exit.svg?react';
import Foot from '@assets/foot.svg?react';
import Map from '@assets/map.svg?react';
import Medal from '@assets/medal.svg?react';
import Pen from '@assets/pen.svg?react';
import Profile from '@assets/profile.svg?react';
import Social from '@assets/social.svg?react';
import Star from '@assets/star.svg?react';
import Whistle from '@assets/whistle.svg?react';

import {
Expand Down Expand Up @@ -74,6 +76,17 @@ export const AllServicesPage = () => {
<Text size="1rem" weight={700}>
게스트 매치
</Text>
<MenuItem
icon={<Pen />}
pageName="게스트 모집하기"
onClickMenuItem={() => moveToPage(PATH_NAME.CREATE_GAME)}
/>
<MenuItem
icon={<Foot />}
pageName="내 근처 게스트 매치"
color={myId ? null : theme.PALETTE.GRAY_300}
onClickMenuItem={() => moveToPage(PATH_NAME.GAMES_NEAR)}
/>
<MenuItem
icon={<Ball />}
pageName="내가 참여한 게스트 매치"
Expand All @@ -91,6 +104,16 @@ export const AllServicesPage = () => {
<Text size="1rem" weight={700}>
크루
</Text>
<MenuItem
icon={<Pen />}
pageName="크루 만들기"
onClickMenuItem={() => moveToPage(PATH_NAME.CREATE_CREW)}
/>
<MenuItem
icon={<Star />}
pageName="추천 크루"
onClickMenuItem={() => moveToPage(PATH_NAME.CREWS_RECOMMEND)}
/>
<MenuItem
icon={<CrewManage />}
pageName="내가 속한 크루"
Expand Down
4 changes: 2 additions & 2 deletions src/pages/CreatePage/CreatePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Header } from '@components/Header';
import { PATH_NAME } from '@constants/pathName';

import { CreatePageContainer } from './CreatePage.style';
import { CreatePageCard } from './CreatePageCard';
import { CreatePageCard } from './components/CreatePageCard';

export const CreatePage = () => {
const navigate = useNavigate();
Expand All @@ -20,7 +20,7 @@ export const CreatePage = () => {

return (
<>
<Header title="글 작성" />
<Header title="글쓰기" />
<CreatePageContainer direction="column" gap={10}>
<CreatePageCard
onClick={moveToCreateGame}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Text } from '@components/shared/Text';

import { StyledCard } from './CreatePage.style.ts';
import { StyledCard } from '../CreatePage.style.ts';

type CreatePageCardProps = {
title: string;
Expand Down
76 changes: 0 additions & 76 deletions src/pages/CrewsDetailPage/CrewsDetailPage.loading.tsx

This file was deleted.

Loading