Merge 7b6870a857 into b843179109

Dockerfile

@@ -1,10 +1,10 @@
 ### STAGE 1: Build ###
-FROM node:8-alpine as build
+FROM node:10-alpine as build
 WORKDIR /srv
 COPY js /srv/js
 COPY pages /srv/pages
 COPY static /srv/static
-COPY next.config.js package.json package-lock.json server.js yarn.lock /srv/
+COPY next.config.js package.json yarn.lock server.js yarn.lock /srv/
 RUN yarn install
 RUN yarn build
 RUN yarn cache clean

package.json

@@ -14,27 +14,27 @@
   "license": "ISC",
   "dependencies": {
     "@zeit/next-css": "^1.0.1",
-    "axios": "^0.18.0",
-    "bootstrap": "^4.1.3",
-    "eslint-config-google": "^0.12.0",
-    "express": "^4.16.4",
-    "next": "^7.0.2",
-    "react": "^16.6.1",
-    "react-bootstrap": "^1.0.0-beta.9",
-    "react-dom": "^16.6.1",
-    "react-favicon": "^0.0.14",
-    "react-notify-toast": "^0.5.0",
-    "react-pose": "^4.0.8",
-    "react-redux": "^5.1.1",
-    "reactstrap": "^6.5.0",
-    "redux": "^4.0.1",
-    "redux-devtools-extension": "^2.13.7",
+    "axios": "^0.19.2",
+    "bootstrap": "^4.5.0",
+    "eslint-config-google": "^0.14.0",
+    "express": "^4.17.1",
+    "next": "^9.4.4",
+    "react": "^16.13.1",
+    "react-bootstrap": "^1.0.1",
+    "react-dom": "^16.13.1",
+    "react-favicon": "^0.0.18",
+    "react-notify-toast": "^0.5.1",
+    "react-pose": "^4.0.10",
+    "react-redux": "^7.2.0",
+    "reactstrap": "^8.4.1",
+    "redux": "^4.0.5",
+    "redux-devtools-extension": "^2.13.8",
     "redux-thunk": "^2.3.0"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-google": "^0.12.0",
-    "eslint-plugin-react": "^7.11.1",
+    "eslint": "^7.2.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-react": "^7.20.0",
     "react-editable-list": "0.0.3"
   }
 }

pages/_app.js

@@ -1,8 +1,9 @@
-import App, {Container} from 'next/app';
+import App from 'next/app';
 import React from 'react';
 import {Provider} from 'react-redux';
 import Notifications from 'react-notify-toast';
 import Favicon from 'react-favicon';
+import Container from 'react-bootstrap/Container';
 
 import withReduxStore from '../js/redux/reduxStoreBinder';
 import {verifyCredentials} from '../js/api.js';
@@ -14,13 +15,15 @@ class TurniereApp extends App {
 
     render() {
         const {Component, pageProps, reduxStore} = this.props;
-        return (<Container>
+        return (
+            <Container fluid="true">
                 <Notifications />
                 <Favicon url="/static/icons/favicon.ico"/>
                 <Provider store={reduxStore}>
                     <Component {...pageProps} />
                 </Provider>
-        </Container>);
+            </Container>
+        );
     }
 }