Skip to content

Commit

Permalink
#111 ๐Ÿ’„Design: ๋ฉ”์ธํŽ˜์ด์ง€ ๋””์ž์ธ ์ˆ˜์ • (#119)
Browse files Browse the repository at this point in the history
* ๐Ÿ’„Design: ๋ฉ”์ธํŽ˜์ด์ง€ ๋””์ž์ธ ์ˆ˜์ •

* ๐Ÿ›Fix: github workflows ์ˆ˜์ •
  • Loading branch information
heejung0413 authored Apr 4, 2024
1 parent d230523 commit b2a82a3
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 52 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/deploy-production.yml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/lint-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: lint check

on: pull_request

jobs:
eslint-test:
name: eslint test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '18.18.0'
- run: npm install
- run: npm run lint
15 changes: 15 additions & 0 deletions .github/workflows/type-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: type check

on: pull_request

jobs:
type-test:
name: type test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '18.18.0'
- run: npm install
- run: npm run typecheck
Empty file modified .husky/pre-commit
100755 โ†’ 100644
Empty file.
3 changes: 1 addition & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
import '@aws-amplify/ui-react/styles.css';
import { withAuthenticator } from '@aws-amplify/ui-react';
import { Amplify } from 'aws-amplify';
import awsConfig from './awsConfig';
import MainLayout from './components/layout/MainLayout';
Expand Down Expand Up @@ -48,4 +47,4 @@ const App = () => {
);
};

export default withAuthenticator(App);
export default App;
30 changes: 16 additions & 14 deletions src/components/home/MainDesign.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,35 @@ import * as L from '@/styles/layout/layout.style';

const MainDesign = () => {
return (
<S.TopTriangleContainer>
<>
<S.TopTriangleContainer>
<S.TopText>
๊ฐœ์ธํšŒ๊ณ ์™€ ํŒ€ ํšŒ๊ณ  ํ…œํ”Œ๋ฆฟ์„ ๋™์‹œ์— ์ œ๊ณตํ•˜๋Š” ํšŒ๊ดด ์›นํŽ˜์ด์ง€์ž…๋‹ˆ๋‹ค. <br />
์šฐ๋ฆฌ๋Š” ๊ฐœ์ธ๊ณผ ํŒ€์ด ๋ชจ๋‘ ๋ฐœ์ „ํ•  ์ˆ˜ ์žˆ๋„๋ก, <br />
๊ณผ๊ฑฐ์˜ ๊ฒฝํ—˜์„ ํšจ๊ณผ์ ์œผ๋กœ ๋˜์ƒˆ๊ธฐ๊ณ  ๋ฐฐ์šฐ๋Š” ๊ฒƒ์„ ์ง€์›ํ•ฉ๋‹ˆ๋‹ค.
</S.TopText>
<S.BottomText>
๊ณผ๊ฑฐ๋ฅผ ํšŒ๊ณ ํ•˜๋ฉฐ ๋ฏธ๋ž˜๋กœ ๋‚˜์•„๊ฐ€๋Š” ๊ณผ์ •์„ ์ด‰์ง„ํ•˜๋Š” ์˜๋ฏธ๋ฅผ ๊ฐ€์ง„ ์ด๋ฆ„์œผ๋กœ <br />
&apos; Past&apos; (๊ณผ๊ฑฐ)์™€ &apos;Forward &apos;(์•ž์œผ๋กœ ๋‚˜์•„๊ฐ€๋‹ค)๋ฅผ ๊ฒฐํ•ฉํ•˜์—ฌ ๋น„์ „์„ ํ‘œํ˜„ํ•ฉ๋‹ˆ๋‹ค.
</S.BottomText>
</S.TopTriangleContainer>
<S.BrandContainer>
<img src={logo} style={{ marginTop: '150px', marginLeft: '80px', width: '300px', zIndex: '999' }} />
<img src={logo} style={{ paddingLeft: '80px', width: '300px' }} />
<S.BrandTextBox>
<S.BrandSmallText style={{ marginLeft: '30%' }}>Moving</S.BrandSmallText>
<S.BrandSmallText style={{ paddingLeft: '20%' }}>Moving</S.BrandSmallText>
<L.LogoText color="white" style={{ fontSize: '70px' }}>
Forward
</L.LogoText>
</S.BrandTextBox>
<S.BrandTextBox>
<S.BrandSmallText style={{ marginLeft: '45%' }}>From the</S.BrandSmallText>
<S.BrandSmallText style={{ paddingLeft: '45%' }}>From the</S.BrandSmallText>
<L.LogoText color="white" style={{ fontSize: '70px' }}>
Past
</L.LogoText>
</S.BrandTextBox>
<S.StartedFreeButton>Get Started for Free</S.StartedFreeButton>
</S.BrandContainer>
<S.TopText style={{ marginLeft: '70%' }}>
๊ฐœ์ธํšŒ๊ณ ์™€ ํŒ€ ํšŒ๊ณ  ํ…œํ”Œ๋ฆฟ์„ ๋™์‹œ์— ์ œ๊ณตํ•˜๋Š” ํšŒ๊ดด ์›นํŽ˜์ด์ง€์ž…๋‹ˆ๋‹ค. <br />
์šฐ๋ฆฌ๋Š” ๊ฐœ์ธ๊ณผ ํŒ€์ด ๋ชจ๋‘ ๋ฐœ์ „ํ•  ์ˆ˜ ์žˆ๋„๋ก, <br />
๊ณผ๊ฑฐ์˜ ๊ฒฝํ—˜์„ ํšจ๊ณผ์ ์œผ๋กœ ๋˜์ƒˆ๊ธฐ๊ณ  ๋ฐฐ์šฐ๋Š” ๊ฒƒ์„ ์ง€์›ํ•ฉ๋‹ˆ๋‹ค.
</S.TopText>
<S.BottomText>
๊ณผ๊ฑฐ๋ฅผ ํšŒ๊ณ ํ•˜๋ฉฐ ๋ฏธ๋ž˜๋กœ ๋‚˜์•„๊ฐ€๋Š” ๊ณผ์ •์„ ์ด‰์ง„ํ•˜๋Š” ์˜๋ฏธ๋ฅผ ๊ฐ€์ง„ ์ด๋ฆ„์œผ๋กœ <br />
&apos; Past&apos; (๊ณผ๊ฑฐ)์™€ &apos;Forward &apos;(์•ž์œผ๋กœ ๋‚˜์•„๊ฐ€๋‹ค)๋ฅผ ๊ฒฐํ•ฉํ•˜์—ฌ ๋น„์ „์„ ํ‘œํ˜„ํ•ฉ๋‹ˆ๋‹ค.
</S.BottomText>
</S.TopTriangleContainer>
</>
);
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/layout/parts/LogoBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import Logo from '@/../public/logo.svg';
import * as S from '@/styles/layout/layout.style';
const LogoBox = () => {
return (
<S.LogoBox>
<>
<S.LogoText color="brand" href="/#">
<img src={Logo} />
Past Forward
</S.LogoText>
</S.LogoBox>
</>
);
};

Expand Down
35 changes: 16 additions & 19 deletions src/styles/Home/home.style.ts
Original file line number Diff line number Diff line change
@@ -1,53 +1,50 @@
import styled from 'styled-components';

export const TopTriangleContainer = styled.div`
position: relative;
background-color: white;
min-width: 1200px;
height: 1000px;
`;

export const TopText = styled.p`
margin-top: 100px;
margin-left: 800px;
margin-top: 50px;
margin-left: 55%;
color: #111b47;
`;

export const BottomText = styled.p`
margin-top: 400px;
margin-left: 100px;
margin-top: 30%;
margin-left: 5%;
color: #111b47;
`;

export const BrandContainer = styled.div`
position: absolute;
width: 100%;
height: 800px;
clip-path: polygon(0 49%, 0 0, 100% 47%, 100% 100%);
clip-path: polygon(0 0, 100% 48%, 100% 100%, 0 56%);
background: rgb(2, 0, 36);
background: linear-gradient(90deg, rgba(2, 0, 36, 1) 0%, rgba(28, 28, 101, 1) 37%, rgba(36, 123, 218, 1) 100%);
padding: 10% 5%;
`;

export const BrandSmallText = styled.p`
color: white;
font-size: 40px;
margin-top: 40px;
margin-right: 10px;
padding-top: 50px;
`;

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

export const StartedFreeButton = styled.button`
background-color: white;
color: #111b47;
font-size: 30px;
padding: 10px 20px;
padding: 10px 40px;
margin-left: 70%;
border-radius: 10px;
&:hover {
background-color: #ababab;
}
`;
export const TopTriangleContainer = styled.div`
position: absolute;
width: 100%;
`;

export const Container = styled.div`
margin: 0 auto;
`;
2 changes: 1 addition & 1 deletion src/styles/layout/layout.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const LogoText = styled.a<ColorProps>`
font-size: 30px;
font-weight: bold;
border: 20px;
padding: 10px 5px;
padding: 10px 20px;
text-decoration: none;
padding-top: 10px;
`;
Expand Down

0 comments on commit b2a82a3

Please sign in to comment.