From 4ce70bff92ef30df6f77a86c534a19774d560ebc Mon Sep 17 00:00:00 2001
From: Ronnie Friman <L4168@student.jamk.fi>
Date: Wed, 17 Jul 2019 17:19:05 +0300
Subject: [PATCH] testing hotfix
---
Dockerfile | 2 ++
default.conf | 10 ++++++++++
src/App.css | 3 ++-
src/components/GameCard.js | 4 +++-
4 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 default.conf
diff --git a/Dockerfile b/Dockerfile
index 1e365dc..88b5046 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 0000000..9829a75
--- /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 b3004ac..5c9f07e 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 b3c5a8c..bfa10a6 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>
);
--
GitLab