From e59dd0ca62d652aeb4a9fae6a46b981a44e4e95b Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 19:07:52 +0100 Subject: [PATCH 1/8] chore: Test heroku --- heroku.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 heroku.yml diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 0000000..1a50739 --- /dev/null +++ b/heroku.yml @@ -0,0 +1,8 @@ +build: + docker: + client: client/Dockerfile + config: + NEXT_PUBLIC_BACKEND_URL: + PORT: 3000 +run: + client: yarn dev -- GitLab From 7367a391031a17fc80e4139e3a35ae10a1e1f240 Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 19:20:55 +0100 Subject: [PATCH 2/8] chore: Change port --- heroku.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heroku.yml b/heroku.yml index 1a50739..b442df2 100644 --- a/heroku.yml +++ b/heroku.yml @@ -3,6 +3,6 @@ build: client: client/Dockerfile config: NEXT_PUBLIC_BACKEND_URL: - PORT: 3000 + PORT: 80 run: client: yarn dev -- GitLab From b08eaaf6a48a048a1da118e4814992033745611a Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 19:36:34 +0100 Subject: [PATCH 3/8] chore: Change container name --- heroku.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heroku.yml b/heroku.yml index b442df2..f34cfef 100644 --- a/heroku.yml +++ b/heroku.yml @@ -1,8 +1,8 @@ build: docker: - client: client/Dockerfile + web: client/Dockerfile config: NEXT_PUBLIC_BACKEND_URL: PORT: 80 run: - client: yarn dev + web: yarn dev -- GitLab From edbafc26e8da8afdefb48253e7f0d571973e0646 Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 20:00:54 +0100 Subject: [PATCH 4/8] feat: fix errors --- client/components/game/AnswerButton.tsx | 4 ++-- client/components/lobby/SwitchSettingsItem.tsx | 5 ----- client/components/scores/ResultList.tsx | 1 + client/pages/scores.tsx | 4 ++-- heroku.yml | 6 +++--- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/client/components/game/AnswerButton.tsx b/client/components/game/AnswerButton.tsx index c08a9d0..c330089 100644 --- a/client/components/game/AnswerButton.tsx +++ b/client/components/game/AnswerButton.tsx @@ -42,8 +42,8 @@ const AnswerButton = ({ > {showAnswer && ( <AvatarList> - {answeredAvatars.map((answeredAvatar) => ( - <AvatarContainer> + {answeredAvatars.map((answeredAvatar, i) => ( + <AvatarContainer key={i}> <Avatar {...answeredAvatar} mask={false} /> </AvatarContainer> ))} diff --git a/client/components/lobby/SwitchSettingsItem.tsx b/client/components/lobby/SwitchSettingsItem.tsx index f2597b6..018cf33 100644 --- a/client/components/lobby/SwitchSettingsItem.tsx +++ b/client/components/lobby/SwitchSettingsItem.tsx @@ -1,7 +1,6 @@ import styled, { css } from 'styled-components'; import Button from '../base/Button'; import FlexContainer from '../base/FlexContainer'; -import TitleWrapper from './TitleWrapper'; type SwitchSettingsItemProps = { optionName: string; @@ -23,10 +22,6 @@ const SwitchSettingsItem = ({ alignItems="center" width="100%" > - <TitleWrapper direction="row" justifyContent="flex-end" maxWidth="15em"> - {optionName} - </TitleWrapper> - <ButtonContainer direction="row" width="60%"> <Switch onClick={() => valueChange('afterReady')} diff --git a/client/components/scores/ResultList.tsx b/client/components/scores/ResultList.tsx index b6d1ac6..f6f3112 100644 --- a/client/components/scores/ResultList.tsx +++ b/client/components/scores/ResultList.tsx @@ -27,6 +27,7 @@ const ResultList = ({ height, sortedUList }: ResultListProps) => { {sortedUList.map((user, index) => { return ( <ListElement + key={index} direction="row" justifyContent="space-evenly" alignItems="center" diff --git a/client/pages/scores.tsx b/client/pages/scores.tsx index 51f19c9..be27000 100644 --- a/client/pages/scores.tsx +++ b/client/pages/scores.tsx @@ -8,7 +8,7 @@ import Header from '../components/base/Header'; import ScoreBottom from '../components/scores/ScoreBottom'; import ResultList from '../components/scores/ResultList'; -const scores: NextPage = () => { +const Scores: NextPage = () => { const [showList, setShowList] = useState(false); const socket = useSocket(); const room = useRoom(); @@ -74,7 +74,7 @@ const Wrapper = styled(FlexContainer)` min-width: 1100px; `; -export default scores; +export default Scores; /* const avatar: AvatarProps = { diff --git a/heroku.yml b/heroku.yml index f34cfef..8d87908 100644 --- a/heroku.yml +++ b/heroku.yml @@ -2,7 +2,7 @@ build: docker: web: client/Dockerfile config: - NEXT_PUBLIC_BACKEND_URL: - PORT: 80 + NEXT_PUBLIC_BACKEND_URL: '' + PORT: 443 run: - web: yarn dev + web: yarn build && yarn start -- GitLab From cd7a607f310078ec1797450e775d5cf8004b9324 Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 20:08:29 +0100 Subject: [PATCH 5/8] chore: change port --- heroku.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heroku.yml b/heroku.yml index 8d87908..5fd5336 100644 --- a/heroku.yml +++ b/heroku.yml @@ -3,6 +3,6 @@ build: web: client/Dockerfile config: NEXT_PUBLIC_BACKEND_URL: '' - PORT: 443 + PORT: 3000 run: web: yarn build && yarn start -- GitLab From c8015687954a194d3d53b030abb71bec82b0b3b7 Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 21:06:10 +0100 Subject: [PATCH 6/8] chore: test node options for heroku --- heroku.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/heroku.yml b/heroku.yml index 5fd5336..1d9267b 100644 --- a/heroku.yml +++ b/heroku.yml @@ -2,6 +2,7 @@ build: docker: web: client/Dockerfile config: + NODE_OPTIONS: '--max_old_space_size=2560' NEXT_PUBLIC_BACKEND_URL: '' PORT: 3000 run: -- GitLab From 6cdd5ce626904eabe2fab3fd6c8278190cb166a7 Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sat, 22 Jan 2022 21:18:31 +0100 Subject: [PATCH 7/8] chore: remove port from heroku.yml --- heroku.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/heroku.yml b/heroku.yml index 1d9267b..20d3c7b 100644 --- a/heroku.yml +++ b/heroku.yml @@ -2,8 +2,6 @@ build: docker: web: client/Dockerfile config: - NODE_OPTIONS: '--max_old_space_size=2560' NEXT_PUBLIC_BACKEND_URL: '' - PORT: 3000 run: web: yarn build && yarn start -- GitLab From 63a1967e7ea76771790ab0021cee085bc8d73af8 Mon Sep 17 00:00:00 2001 From: Jonas Held <johnluckpickerd@pm.me> Date: Sun, 23 Jan 2022 00:13:00 +0100 Subject: [PATCH 8/8] chore: remove heroku.yml --- heroku.yml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 heroku.yml diff --git a/heroku.yml b/heroku.yml deleted file mode 100644 index 20d3c7b..0000000 --- a/heroku.yml +++ /dev/null @@ -1,7 +0,0 @@ -build: - docker: - web: client/Dockerfile - config: - NEXT_PUBLIC_BACKEND_URL: '' -run: - web: yarn build && yarn start -- GitLab