diff --git a/Dockerfile b/Dockerfile index 1e365dce1cd4c45711cd0913b72f63c4a70b7138..88b5046798182ce34716adc7cd5cedc75075984c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,11 +3,13 @@ WORKDIR /usr/src/app ENV PATH /usr/src/app/node_modules/.bin:$PATH COPY package*.json ./ RUN npm install +RUN npm install react-scripts@3.0.1 -g COPY . . RUN npm run build # production environment FROM nginx:1.16.0-alpine COPY --from=build /usr/src/app/build /usr/share/nginx/html +COPY default.conf /etc/nginx/conf.d/default.conf EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] diff --git a/default.conf b/default.conf new file mode 100644 index 0000000000000000000000000000000000000000..9829a75b9b25ff3371dd012575b4a5431d89af62 --- /dev/null +++ b/default.conf @@ -0,0 +1,10 @@ +server { + listen 80; + server_name localhost; + location / { + try_files $uri /index.html; + root /usr/share/nginx/html; + index index.html index.htm; + } + error_page 500 502 503 504 /50x.html; +} diff --git a/src/App.css b/src/App.css index b3004ac40734d1b05cd893b254948d77559da7dc..5c9f07ee39e8b44af5cc40b69cfa789f956cafb9 100644 --- a/src/App.css +++ b/src/App.css @@ -1,9 +1,10 @@ body { margin: 0; padding: 0; - overflow: hidden; background-color: #1d1d1b; color: #ffffff; + overflow-y: scroll; + overflow-x: hidden; } .hidden { diff --git a/src/components/GameCard.js b/src/components/GameCard.js index b3c5a8cf573caefe7d209df8f30e3cd4697a29e3..bfa10a6097d919d4339e6341e99e753b4d41b202 100644 --- a/src/components/GameCard.js +++ b/src/components/GameCard.js @@ -54,7 +54,9 @@ export default class GameCard extends React.Component { <Link to={{ pathname: "/game", search: "?id=" + this.state.gameInfo.id }} > - <button type="button">Select</button> + <button id={`select${this.state.gameInfo.name}`} type="button"> + Select + </button> </Link> </div> );