Merge pull request #26 from Polynomeer/fix/25/path

fix: Fix import path (#25) Resolve (#26 )
codesquad-members-2021 · May 7, 2021 · 5efa52e · 5efa52e
2 parents 7bfd61a + 289fa82
commit 5efa52e
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 39 deletions.
diff --git a/FE/baseball/.firebase/hosting.YnVpbGQ.cache b/FE/baseball/.firebase/hosting.YnVpbGQ.cache
@@ -1,9 +1,10 @@
-asset-manifest.json,1620363752161,2043f5943394c285d3fe993c82a02fa6033bbc52173d7d31920f4ceaeb7def5c
-index.html,1620363752161,ef5f4123179e2315dfe379f6d3a01b500eea607437fa13dc7c9dc5bb727be2af
-static/js/2.390a8b7d.chunk.js.LICENSE.txt,1620363752163,bfbf3a4b9e414262e302b9c850733cb7cfafa9577cb62b814d04300a511215fc
-static/js/runtime-main.8ce5e419.js,1620363752163,798213e312e2c64d125f9dc9390e3c4e343a1b0e138dd357de3df7c667ff3178
-static/js/main.fe7d7855.chunk.js,1620363752163,cb3fb8c25296650b8265361811282ceaa36f6d3c130b70bcb56812dec333ca4c
-static/js/runtime-main.8ce5e419.js.map,1620363752163,4da9ed8a4da600a86f0f34982c1a174891b960305fdd54ed3c3b9815bb40148b
-static/js/main.fe7d7855.chunk.js.map,1620363752163,5c92c98b7007bd9684049f28ac461c48e274ede43b322fea3cf987cbb28cda3a
-static/js/2.390a8b7d.chunk.js,1620363752162,ae4657699f604382a815cd59d035a958bfe22b0e467713af6e45b657f1dab1ed
-static/js/2.390a8b7d.chunk.js.map,1620363752163,fc09628225b6821ef67f9bcee3adcec5cd397a34eee7f05b9ef95244c1ea6c0d
+404.html,1620368155924,05cbc6f94d7a69ce2e29646eab13be2c884e61ba93e3094df5028866876d18b3
+static/js/2.390a8b7d.chunk.js.LICENSE.txt,1620368135148,bfbf3a4b9e414262e302b9c850733cb7cfafa9577cb62b814d04300a511215fc
+asset-manifest.json,1620368135146,6612a9bc10d7439427ccda0e70b727fdd9f6a16f8642c65b19724a12e31af205
+index.html,1620368135146,b1d9b897a6d46740e544f16fbd93456b573d3fbeec621223c5f89d6af3087b52
+static/js/runtime-main.8ce5e419.js,1620368135148,798213e312e2c64d125f9dc9390e3c4e343a1b0e138dd357de3df7c667ff3178
+static/js/main.9658394d.chunk.js,1620368135148,58b5ea3f62525dcdf63ffb940165d0f13b8e8174796d1904f55994c454550dc0
+static/js/runtime-main.8ce5e419.js.map,1620368135148,4da9ed8a4da600a86f0f34982c1a174891b960305fdd54ed3c3b9815bb40148b
+static/js/main.9658394d.chunk.js.map,1620368135148,0f6d8e5fc8b24df3330242a39690ccd201fe2f0d32912af688ab074ec4a42ae3
+static/js/2.390a8b7d.chunk.js,1620368135148,ae4657699f604382a815cd59d035a958bfe22b0e467713af6e45b657f1dab1ed
+static/js/2.390a8b7d.chunk.js.map,1620368135148,fc09628225b6821ef67f9bcee3adcec5cd397a34eee7f05b9ef95244c1ea6c0d
diff --git a/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreItem.jsx b/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreItem.jsx
@@ -1,4 +1,4 @@
-import { ScoreBoardStyles as S } from '../ScoreBoardStyles';
+import { ScoreBoardStyles as S } from '@/Components/Game/ScoreBoard/ScoreBoardStyles';
 
 const ScoreItem = () => {
   return <S.ScoreItem>1</S.ScoreItem>;

diff --git a/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreRow.jsx b/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreRow.jsx
@@ -1,7 +1,7 @@
-import { ScoreBoardStyles as S } from '../ScoreBoardStyles';
-import AttackTeamTag from '../Teams/AttackTeamTag';
-import TeamNameBox from '../Teams/TeamNameBox';
+import AttackTeamTag from '@/Components/Game/ScoreBoard/Teams/AttackTeamTag';
+import TeamNameBox from '@/Components/Game/ScoreBoard/Teams/TeamNameBox';
 import ScoreItem from './ScoreItem';
+import { ScoreBoardStyles as S } from '@/Components/Game/ScoreBoard/ScoreBoardStyles';
 
 const ScoreRow = ({ teamName }) => {
   return (

diff --git a/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreRowHead.jsx b/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreRowHead.jsx
@@ -1,7 +1,7 @@
+import AttackTeamTag from '@/Components/Game/ScoreBoard/Teams/AttackTeamTag';
+import TeamName from '@/Components/Game/ScoreBoard/Teams/TeamName';
+import { ScoreBoardStyles as S } from '@/Components/Game/ScoreBoard/ScoreBoardStyles';
 import { BLANK } from '@/Utils/const';
-import { ScoreBoardStyles as S } from '../ScoreBoardStyles';
-import AttackTeamTag from '../Teams/AttackTeamTag';
-import TeamName from '../Teams/TeamName';
 
 import ScoreItem from './ScoreItem';
 

diff --git a/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreTable.jsx b/FE/baseball/src/Components/Game/ScoreBoard/ScoreTable/ScoreTable.jsx
@@ -1,6 +1,6 @@
-import { ScoreBoardStyles as S } from '../ScoreBoardStyles';
 import ScoreRow from './ScoreRow';
 import ScoreRowHead from './ScoreRowHead';
+import { ScoreBoardStyles as S } from '@/Components/Game/ScoreBoard/ScoreBoardStyles';
 
 const ScoreTable = () => {
   return (

diff --git a/FE/baseball/src/Components/Game/ScoreBoard/Teams/TeamName.jsx b/FE/baseball/src/Components/Game/ScoreBoard/Teams/TeamName.jsx
@@ -1,4 +1,4 @@
-import { ScoreBoardStyles as S } from '../ScoreBoardStyles';
+import { ScoreBoardStyles as S } from '@/Components/Game/ScoreBoard/ScoreBoardStyles';
 
 const TeamName = ({ teamName }) => {
   return <S.TeamName>{teamName}</S.TeamName>;

diff --git a/FE/baseball/src/Components/Game/ScoreBoard/Teams/TeamNameBox.jsx b/FE/baseball/src/Components/Game/ScoreBoard/Teams/TeamNameBox.jsx
@@ -1,6 +1,6 @@
-import { ScoreBoardStyles as S } from '../ScoreBoardStyles';
 import CurrentPlayerTag from './CurrentPlayerTag';
 import TeamName from './TeamName';
+import { ScoreBoardStyles as S } from '@/Components/Game/ScoreBoard/ScoreBoardStyles';
 
 const TeamNameBox = ({ teamName }) => {
   return (

diff --git a/FE/baseball/src/Components/Home/MatchInfo/MatchBox/Match.jsx b/FE/baseball/src/Components/Home/MatchInfo/MatchBox/Match.jsx
@@ -1,7 +1,7 @@
-import { MatchBox as S } from '@/Components/Home/HomeStyles';
 import { Link } from 'react-router-dom';
 import TeamName from './TeamName';
 import VS from './VS';
+import { MatchBox as S } from '@/Components/Home/HomeStyles';
 
 const Match = () => {
   return (

diff --git a/FE/baseball/src/Components/Home/MatchInfo/MatchInfoBody.jsx b/FE/baseball/src/Components/Home/MatchInfo/MatchInfoBody.jsx
@@ -1,5 +1,5 @@
-import { MatchInfo as S } from '@/Components/Home/HomeStyles';
 import MatchBox from './MatchBox/MatchBox';
+import { MatchInfo as S } from '@/Components/Home/HomeStyles';
 
 const MatchInfoBody = () => {
   return (

diff --git a/FE/baseball/src/Components/Intro/GameStartButton.jsx b/FE/baseball/src/Components/Intro/GameStartButton.jsx
@@ -1,6 +1,6 @@
 import GameTitle from '@/Components/Intro/GameTitle';
-import { IntroStyles as S } from '@/Components/Intro/IntroStyles';
 import { Link } from 'react-router-dom';
+import { IntroStyles as S } from '@/Components/Intro/IntroStyles';
 
 const GameStartButton = () => {
   return (

diff --git a/FE/baseball/src/Components/Intro/GameTitle.jsx b/FE/baseball/src/Components/Intro/GameTitle.jsx
@@ -2,21 +2,21 @@ import { IntroStyles as S } from '@/Components/Intro/IntroStyles';
 
 const GameTitle = () => {
   // prettier-ignore
-  const title = 
-  `
-   /$$$$$$$$                                /$$$$$$ /$$ /$$
-  |__  $$__/                               |_  $$_/| $$| $$
-     | $$  /$$$$$$   /$$$$$$  /$$$$$$/$$$$   | $$  | $$| $$ /$$   /$$
-     | $$ /$$__  $$ |____  $$| $$_  $$_  $$  | $$  | $$| $$| $$  | $$
-     | $$| $$$$$$$$  /$$$$$$$| $$ \\ $$ \\ $$  | $$  | $$| $$| $$  | $$
-     | $$| $$_____/ /$$__  $$| $$ | $$ | $$  | $$  | $$| $$| $$  | $$
-     | $$|  $$$$$$$|  $$$$$$$| $$ | $$ | $$ /$$$$$$| $$| $$|  $$$$$$$
-     |__/ \\_______/ \\_______/|__/ |__/ |__/|______/|__/|__/ \\____  $$
-                                                            /$$  | $$
-                                                           |  $$$$$$/
-                                                            \\______/
-                                                            `
-  return <S.GameTitle>{title}</S.GameTitle>;
+  // const title =
+  // `
+  //  /$$$$$$$$                                /$$$$$$ /$$ /$$
+  // |__  $$__/                               |_  $$_/| $$| $$
+  //    | $$  /$$$$$$   /$$$$$$  /$$$$$$/$$$$   | $$  | $$| $$ /$$   /$$
+  //    | $$ /$$__  $$ |____  $$| $$_  $$_  $$  | $$  | $$| $$| $$  | $$
+  //    | $$| $$$$$$$$  /$$$$$$$| $$ \\ $$ \\ $$  | $$  | $$| $$| $$  | $$
+  //    | $$| $$_____/ /$$__  $$| $$ | $$ | $$  | $$  | $$| $$| $$  | $$
+  //    | $$|  $$$$$$$|  $$$$$$$| $$ | $$ | $$ /$$$$$$| $$| $$|  $$$$$$$
+  //    |__/ \\_______/ \\_______/|__/ |__/ |__/|______/|__/|__/ \\____  $$
+  //                                                           /$$  | $$
+  //                                                          |  $$$$$$/
+  //                                                           \\______/
+  //                                                           `
+  return <S.GameTitle>{"Team Illy's BASEBALL GAME!"}</S.GameTitle>;
 };
 
 export default GameTitle;
diff --git a/FE/baseball/src/Components/Intro/Intro.jsx b/FE/baseball/src/Components/Intro/Intro.jsx
@@ -1,5 +1,5 @@
-import { IntroStyles as S } from '@/Components/Intro/IntroStyles';
 import GameStartButton from '@/Components/Intro/GameStartButton';
+import { IntroStyles as S } from '@/Components/Intro/IntroStyles';
 
 const Intro = () => {
   const backgroundUrl =

diff --git a/FE/baseball/src/Components/Intro/IntroStyles.jsx b/FE/baseball/src/Components/Intro/IntroStyles.jsx
@@ -14,7 +14,9 @@ const IntroStyles = {
 
   GameTitle: styled.div`
     width: 100%;
-    font-size: 16px;
+    font-size: 50px;
+    font-weight: 900;
+    text-align: center;
   `,
 
   GameStartButton: styled(CS.BOX.FLEX_CENTER_BOX)`