Skip to content

Commit

Permalink
Merge pull request #8 from innerstella/develop
Browse files Browse the repository at this point in the history
v1.2.1
  • Loading branch information
innerstella authored Apr 28, 2024
2 parents 72506cb + f53e500 commit 9fbc5c1
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 13 deletions.
6 changes: 3 additions & 3 deletions build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"files": {
"main.css": "/static/css/main.5d684795.css",
"main.js": "/static/js/main.bbfd1199.js",
"main.js": "/static/js/main.891e2770.js",
"index.html": "/index.html",
"main.5d684795.css.map": "/static/css/main.5d684795.css.map",
"main.bbfd1199.js.map": "/static/js/main.bbfd1199.js.map"
"main.891e2770.js.map": "/static/js/main.891e2770.js.map"
},
"entrypoints": [
"static/css/main.5d684795.css",
"static/js/main.bbfd1199.js"
"static/js/main.891e2770.js"
]
}
2 changes: 1 addition & 1 deletion build/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><meta property="og:title" content="직관일기"/><meta property="og:url" content="https://happybaseball-diary.web.app/"/><meta property="og:image" content="https://github.com/innerstella/happybaseball-diary/blob/main/public/assets/png/opengraph.png?raw=true"/><meta property="og:description" content="⚾️ 나의 직관 승률은?"/><meta name="twitter:card" content="summary_large_image"/><meta name="twitter:title" content="직관일기"/><meta name="twitter:description" content="⚾️ 나의 직관 승률은?"/><meta name="twitter:image" content="https://github.com/innerstella/happybaseball-diary/blob/main/public/assets/png/opengraph.png?raw=true"/><title>직관일기</title><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"/><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"/><script defer="defer" src="/static/js/main.bbfd1199.js"></script><link href="/static/css/main.5d684795.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body><script type="text/javascript" src="//wcs.naver.net/wcslog.js"></script><script type="text/javascript">if(!wcs_add)var wcs_add={};wcs_add.wa="1d106f0c7b05040",window.wcs&&wcs_do()</script></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><meta property="og:title" content="직관일기"/><meta property="og:url" content="https://happybaseball-diary.web.app/"/><meta property="og:image" content="https://github.com/innerstella/happybaseball-diary/blob/main/public/assets/png/opengraph.png?raw=true"/><meta property="og:description" content="⚾️ 나의 직관 승률은?"/><meta name="twitter:card" content="summary_large_image"/><meta name="twitter:title" content="직관일기"/><meta name="twitter:description" content="⚾️ 나의 직관 승률은?"/><meta name="twitter:image" content="https://github.com/innerstella/happybaseball-diary/blob/main/public/assets/png/opengraph.png?raw=true"/><title>직관일기</title><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"/><link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0"/><script defer="defer" src="/static/js/main.891e2770.js"></script><link href="/static/css/main.5d684795.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body><script type="text/javascript" src="//wcs.naver.net/wcslog.js"></script><script type="text/javascript">if(!wcs_add)var wcs_add={};wcs_add.wa="1d106f0c7b05040",window.wcs&&wcs_do()</script></html>
3 changes: 3 additions & 0 deletions build/static/js/main.891e2770.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions build/static/js/main.bbfd1199.js

This file was deleted.

2 changes: 2 additions & 0 deletions src/components/BackBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export default BackBar;

const Container = styled.div`
margin-top: 50px;
display: flex;
width: 100%;
.svg {
height: 1.875rem;
}
Expand Down
9 changes: 7 additions & 2 deletions src/pages/create/Create.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ export const MainContainer = styled.div`
padding: 0 25px;
padding-bottom: 10rem;
height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
/* justify-content: center; */
background-color: #fafafa;
font-family: "SUIT", sans-serif;
overflow-x: hidden;
Expand Down Expand Up @@ -39,8 +44,8 @@ export const MainContainer = styled.div`

export const FabContainer = styled.div`
position: fixed;
display: flex;
justify-content: center;
width: 390px;
height: 5rem;
bottom: 0rem;
z-index: 5;
Expand Down
1 change: 1 addition & 0 deletions src/pages/home/Home.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const FabContainer = styled.div`
height: 5rem;
bottom: 0rem;
z-index: 5;
width: 390px;
`;

export const Banner = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/components/CreateButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const Container = styled.div`
display: flex;
align-items: center;
justify-content: center;
width: 300px;
width: 100%;
height: 3.75rem;
border-radius: 0.625rem;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/mypage/components/my-team/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const MyTeam = () => {
myTeam: getWinningRate(myData, CURR_YEAR),
otherTeam: getWinningRate(otherData, CURR_YEAR),
});
}, []);
}, [teamData]);

return (
<Container>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/mypage/components/odd-box/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const OddBox = ({ odd, team }: { odd: number; team: string }) => {
<S.Container>
<p>{team} 직관 승률</p>
<p>
<span>{odd}</span>
<span>{isNaN(odd) ? "0.000" : odd}</span>
</p>
</S.Container>
);
Expand Down

0 comments on commit 9fbc5c1

Please sign in to comment.