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

Group/rank #46

Merged
merged 5 commits into from
Jul 29, 2024
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
102 changes: 102 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 @@ -7,6 +7,7 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"react": "^18.3.1",
"react-calendar": "^5.0.0",
"react-dom": "^18.3.1",
"react-router-dom": "^6.24.1",
"react-scripts": "^5.0.1",
Expand Down
17 changes: 17 additions & 0 deletions src/assets/group/RankBackIcon1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/assets/group/RankBackIcon2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/group/RankItem.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/icons/group/alarm.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/icons/group/clock.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/icons/group/link.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/icons/group/location.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/icons/group/memo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 3 additions & 7 deletions src/components/MainLayout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,15 @@ const Content = styled.div`
flex-direction: column;
`;


function MainLayout({ children }) {

console.log("MainLayout 렌더링");
console.log('MainLayout 렌더링');

return (
<LayoutContainer>
<Content>
{children}
</Content>
<Content>{children}</Content>
<MainNavigationBar />
</LayoutContainer>
);
}

export default MainLayout;
export default MainLayout;
42 changes: 42 additions & 0 deletions src/pages/group/BasicInfo.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import styled from 'styled-components';
import ClubMainInfo from './group_components/ClubMainInfo';
import ClubSubInfo from './group_components/ClubSubInfo';
import { useState } from 'react';
import Rank from './Rank';

const BaseContainer = styled.div`
width: 100%;
height: 100vh;
padding: 16px 20px;
display: flex;
flex-direction: column;
gap: 12px;
box-sizing: border-box;
`;

const BasicInfo = () => {
const [isModalOpen, setIsModalOpen] = useState(false);
const toggleModal = () => {
setIsModalOpen((prev) => !prev);
console.log(isModalOpen);
};
const closeModal = () => {
setIsModalOpen(false);
};
return (
<BaseContainer>
<ClubMainInfo
region={'서울'}
personality={'모두 환영'}
name={'중앙 가르드'}
memRecent={32}
memMax={40}
establishDate={'2023.09.01'}
/>
<ClubSubInfo onClick={toggleModal} />
<Rank isOpen={isModalOpen} onClose={closeModal} />
</BaseContainer>
);
};

export default BasicInfo;
Loading