Skip to content

Commit

Permalink
merge : aboutme 영역
Browse files Browse the repository at this point in the history
merge : aboutme 영역
  • Loading branch information
sheepdog13 authored Feb 17, 2024
2 parents 2e7b315 + c448c84 commit e74494d
Show file tree
Hide file tree
Showing 15 changed files with 294 additions and 15 deletions.
Binary file added client/public/img/bond.webp
Binary file not shown.
13 changes: 4 additions & 9 deletions client/src/components/views/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import { asynsLogout } from "../../../_reducers/user";
import { toggleDarkMode } from "../../../_reducers/darkmode";

const Wapper = styled.div`
position: fixed;
top: 0;
width: 100%;
height: 64px;
display: flex;
padding: 0 30px;
flex-direction: row;
justify-content: space-between;
align-items: center;
background-color: ${(props) => props.theme.bgColor};
color: ${(props) => props.theme.textColor};
`;

const Burger = styled.label`
Expand Down Expand Up @@ -69,7 +69,7 @@ const BurSpan = styled.span`
position: absolute;
height: 4px;
width: 100%;
background: black;
background: ${(props) => props.theme.textColor};
border-radius: 9px;
opacity: 1;
left: 0;
Expand All @@ -94,11 +94,6 @@ const RightBox = styled.div`
flex-direction: row;
align-items: center;
gap: 20px;
svg {
@media (max-width: 820px) {
display: none;
}
}
`;

const LoginBtn = styled.button`
Expand All @@ -114,7 +109,7 @@ const LoginBtn = styled.button`
Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif,
Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
font-size: 100%;
font-weight: 900;
font-weight: 800;
line-height: 1.5;
margin: 0;
-webkit-mask-image: -webkit-radial-gradient(#000, #fff);
Expand Down
179 changes: 179 additions & 0 deletions client/src/components/views/LandingPage/AboutMe.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
import React from "react";
import styled from "styled-components";
import SvgIcon from "@mui/material/SvgIcon";
import GitHubIcon from "@mui/icons-material/GitHub";
import InstagramIcon from "@mui/icons-material/Instagram";
import AlternateEmailIcon from "@mui/icons-material/AlternateEmail";

const Wrapper = styled.div`
display: flex;
flex-direction: column;
width: 100%;
padding: 15px;
gap: 10px;
border-radius: 10px;
background-color: ${(props) => props.theme.boxBgColor};
color: ${(props) => props.theme.textColor};
`;

const Title = styled.div`
@media (max-width: 820px) {
font-size: 15px;
}
display: flex;
font-size: 18px;
font-weight: 700;
`;

const ContentBox = styled.div`
display: flex;
flex-direction: row;
`;

const ProfileBox = styled.div`
@media (max-width: 820px) {
width: 30%;
gap: 12px;
}
display: flex;
flex: 1;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 20px;
`;

const ProfileImg = styled.img`
@media (max-width: 820px) {
width: 120px;
height: 120px;
}
width: 180px;
height: 180px;
margin-top: 15px;
border-radius: 50%;
object-fit: cover;
`;

const ProfileName = styled.div`
@media (max-width: 820px) {
font-size: 18px;
}
display: flex;
font-size: 20px;
font-weight: 900;
`;

const DescBox = styled.div`
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
line-height: 1.1;
`;

const ProfileDesc = styled.div`
@media (max-width: 820px) {
font-size: 13px;
}
font-size: 15px;
color: #d9d9d9;
opacity: 0.7;
`;

const IconBox = styled.div`
@media (max-width: 820px) {
gap: 15px;
}
display: flex;
flex-direction: row;
gap: 20px;
margin-bottom: 10px;
svg {
@media (max-width: 820px) {
font-size: 25px;
}
font-size: 30px;
&:hover {
color: #b6dcec;
}
}
`;

const IntroBox = styled.div`
@media (min-width: 820px) {
display: none;
}
display: flex;
width: 70%;
flex-direction: column;
justify-content: space-evenly;
align-items: center;
`;

const IntroTite = styled.div`
font-size: 30px;
text-align: center;
line-height: 1.3;
font-weight: 700;
`;

const IntroDesc = styled.div`
text-align: center;
line-height: 1.5;
font-size: 20px;
font-weight: 500;
color: #8c8c8c;
`;

function AboutMe() {
return (
<Wrapper>
<Title>About Me</Title>
<ContentBox>
<ProfileBox>
<ProfileImg
src={`${process.env.PUBLIC_URL}/img/bond.webp`}
alt="bond"
/>
<ProfileName>sheepdog</ProfileName>
<DescBox>
<ProfileDesc>FrontEnd Developer</ProfileDesc>
<ProfileDesc>Busan, Korea</ProfileDesc>
</DescBox>
<IconBox>
<SvgIcon
onClick={() => {
window.open("https://github.com/sheepdog13");
}}
component={GitHubIcon}
fontSize={"inherit"}
/>
<SvgIcon
onClick={() => {
window.open("https://www.instagram.com/jo_chang_uk/");
}}
component={InstagramIcon}
fontSize={"inherit"}
/>
<SvgIcon
onClick={() => {
window.open(`mailto:[email protected]`);
}}
component={AlternateEmailIcon}
fontSize={"inherit"}
/>
</IconBox>
</ProfileBox>
<IntroBox>
<IntroTite>Blog</IntroTite>
<IntroDesc>
안녕하세요 자바스크립트를 <br /> 주로 다루는 기술 블로그입니다.
</IntroDesc>
</IntroBox>
</ContentBox>
</Wrapper>
);
}

export default AboutMe;
43 changes: 39 additions & 4 deletions client/src/components/views/LandingPage/LandingPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import Auth from "../../../hoc/auth";
import Header from "../Header/Header";
import styled from "styled-components";
import { useSelector } from "react-redux";
import AboutMe from "./AboutMe";

const Wrapper = styled.div`
width: 100%;
height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background-color: ${(props) => props.theme.bgColor};
color: ${(props) => props.theme.textColor};
`;
Expand All @@ -20,6 +20,32 @@ const H1 = styled.h1`
font-size: 30px;
font-weight: 500;
`;
const ContentBox = styled.div`
@media (max-width: 820px) {
flex-direction: column;
}
width: 100%;
margin-top: 15px;
padding: 0 2rem;
gap: 15px;
display: flex;
flex-direction: row;
`;
const LeftContentBox = styled.div`
display: flex;
width: 300px;
@media (max-width: 820px) {
width: 100%;
}
`;
const RightContentBox = styled.div`
display: flex;
flex: 1;
justify-content: center;
align-items: center;
border-radius: 10px;
background-color: ${(props) => props.theme.boxBgColor};
`;

function LandingPage() {
// const logout = async () => {
Expand All @@ -35,10 +61,19 @@ function LandingPage() {
const isLogin = useSelector((state) => state.user.auth.isAuth);

return (
<Wrapper>
<>
<Header />
{isLogin && <H1>반갑습니다 {username}님!</H1>}
</Wrapper>
<Wrapper>
<ContentBox>
<LeftContentBox>
<AboutMe />
</LeftContentBox>
<RightContentBox>
{isLogin && <H1>반갑습니다 {username}님!</H1>}
</RightContentBox>
</ContentBox>
</Wrapper>
</>
);
}

Expand Down
2 changes: 2 additions & 0 deletions client/src/fonts.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
declare module "*.ttf";
declare module "*.otf";
Binary file added client/src/fonts/SCDream2.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream3.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream4.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream5.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream6.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream7.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream8.otf
Binary file not shown.
Binary file added client/src/fonts/SCDream9.otf
Binary file not shown.
5 changes: 3 additions & 2 deletions client/src/styles/GlobalStyles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createGlobalStyle } from "styled-components";

import { fonts } from "./fonts";
const GlobalStyles = createGlobalStyle`
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
Expand All @@ -14,11 +14,12 @@ const GlobalStyles = createGlobalStyle`
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
${fonts}
font-family: "SCDream";
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
box-sizing: border-box;
}
Expand Down
67 changes: 67 additions & 0 deletions client/src/styles/fonts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import { css } from "styled-components";
import SCDream2 from "../fonts/SCDream2.otf";
import SCDream3 from "../fonts/SCDream3.otf";
import SCDream4 from "../fonts/SCDream4.otf";
import SCDream5 from "../fonts/SCDream5.otf";
import SCDream6 from "../fonts/SCDream6.otf";
import SCDream7 from "../fonts/SCDream7.otf";
import SCDream8 from "../fonts/SCDream8.otf";
import SCDream9 from "../fonts/SCDream9.otf";

export const fonts = css`
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 200;
src: url(${SCDream2}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: normal;
src: url(${SCDream3}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 400;
src: url(${SCDream4}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 500;
src: url(${SCDream5}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 600;
src: url(${SCDream6}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 700;
src: url(${SCDream7}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 800;
src: url(${SCDream8}) format("opentype");
}
@font-face {
font-family: "SCDream";
src: local("SCDream"), local("SCDream");
font-weight: 900;
src: url(${SCDream9}) format("opentype");
}
`;

0 comments on commit e74494d

Please sign in to comment.