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.

Sign up for GitHub

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

Feat#7 header bar #13

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Feat#7 header bar #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d435bf
add assets
YangJJune Jul 10, 2024
2b44e83
Create TopBarText.tsx
YangJJune Jul 10, 2024
0ce6de1
Add fonts and TopBarTextStyles
YangJJune Jul 10, 2024
3de4d0f
Merge branch 'main' of https://github.com/KUIT-Space/KUIT-Space-front…
Turtle-Hwan Jul 10, 2024
be78770
setting: vscode setting 수정
Turtle-Hwan Jul 10, 2024
e55d026
style: TopBarText import 절대경로, styled-component 분리
Turtle-Hwan Jul 10, 2024
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
12 changes: 9 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
{
"editor.codeActionsOnSave": {
"source.fixAll": true,
},
"editor.formatOnSave": true,
"source.fixAll": "always",
},
"editor.formatOnSave": true,
"editor.tabSize": 2,

"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
80 changes: 80 additions & 0 deletions src/components/TopBarText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import { FC } from "react";
import logo from "@/assets/logo_space.svg";
import back from "@/assets/icon_back.svg";
import * as sty from "@/styles/TopBarText.styled";
import { useNavigate } from "react-router-dom";

export enum LeftEnum {
Logo = "logo",
Back = "back",
None = "none",
}

interface topbarProps {
left: LeftEnum;
center: string;
right: string;
}

const TopBarText: FC<topbarProps> = ({ left, center, right }) => {
const navigate = useNavigate();
switch (left) {
case "logo":
return (
<div>
<sty.StyledTopBarDiv>
<sty.StyledLeftDiv
onClick={() => {
navigate("/");
}}
>
<img src={logo}></img>
</sty.StyledLeftDiv>
<sty.StyledCenterDiv>
<sty.StyledCenterP>{center}</sty.StyledCenterP>
</sty.StyledCenterDiv>
<sty.StyledRightDiv>
<sty.StyledRightP>{right}</sty.StyledRightP>
</sty.StyledRightDiv>
</sty.StyledTopBarDiv>
</div>
);

case "back":
return (
<div>
<sty.StyledTopBarDiv>
<sty.StyledLeftDiv
onClick={() => {
navigate(-1);
}}
>
<img src={back}></img>
</sty.StyledLeftDiv>
<sty.StyledCenterDiv>
<sty.StyledCenterP>{center}</sty.StyledCenterP>
</sty.StyledCenterDiv>
<sty.StyledRightDiv>
<sty.StyledRightP>{right}</sty.StyledRightP>
</sty.StyledRightDiv>
</sty.StyledTopBarDiv>
</div>
);

case "none":
return (
<div>
<sty.StyledTopBarDiv>
<sty.StyledLeftDiv></sty.StyledLeftDiv>
<sty.StyledCenterDiv>
<sty.StyledCenterP>{center}</sty.StyledCenterP>
</sty.StyledCenterDiv>
<sty.StyledRightDiv>
<sty.StyledRightP>{right}</sty.StyledRightP>
</sty.StyledRightDiv>
</sty.StyledTopBarDiv>
</div>
);
}
};
export default TopBarText;
4 changes: 2 additions & 2 deletions src/styles/GlobalStyles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { createGlobalStyle } from "styled-components";

const GlobalStyle = createGlobalStyle`

`
`;

export default GlobalStyle;
export default GlobalStyle;
37 changes: 37 additions & 0 deletions src/styles/TopBarText.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import styled from "styled-components";

export const StyledTopBarDiv = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
`;

export const StyledLeftDiv = styled.div`
${(props) => props.onClick && "cursor: pointer;"}

img {
width: 120px;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

요렇게 props 받아오는 걸로 바꿨습니다.

img 관련 css도 styled에 통일하기 위해 여기서 width 속성을 줬습니다.

`;

export const StyledCenterDiv = styled.div`
width: 160px;
text-align: center;
`;

export const StyledRightDiv = styled.div`
width: 160px;
`;

export const StyledCenterP = styled.p`
font-family: "Freesentation M";
font-size: 20px;
color: white;
`;

export const StyledRightP = styled.p`
font-family: "Freesentation M";
font-size: 16px;
color: white;
margin-right: 22px;
`;