From 185f0d55340067b4afa460cc52ed33c8e752fa60 Mon Sep 17 00:00:00 2001
From: Thor77 <thor77@thor77.org>
Date: Fri, 10 Jun 2022 20:53:13 +0200
Subject: [PATCH] Move all css imports into _app.js

https://nextjs.org/docs/basic-features/built-in-css-support
---
 js/components/EditableStringList.js | 2 --
 js/components/ErrorComponents.js    | 3 ---
 js/components/Login.js              | 1 -
 js/components/NumericInput.js       | 1 -
 next.config.js                      | 3 ---
 pages/_app.js                       | 9 +++++++++
 pages/create.js                     | 1 -
 pages/faq.js                        | 2 --
 pages/imprint.js                    | 1 -
 pages/index.js                      | 3 ---
 pages/list.js                       | 1 -
 pages/login.js                      | 2 --
 pages/privacy.js                    | 2 --
 pages/private.js                    | 1 -
 pages/profile.js                    | 2 --
 pages/register.js                   | 3 ---
 pages/tournament-edit.js            | 2 --
 pages/tournament.js                 | 2 --
 18 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/js/components/EditableStringList.js b/js/components/EditableStringList.js
index 836d4d6..e161c73 100644
--- a/js/components/EditableStringList.js
+++ b/js/components/EditableStringList.js
@@ -3,8 +3,6 @@ import {
     Alert, Button, Card, CardBody, CardTitle, Input, InputGroup, InputGroupAddon
 } from 'reactstrap';
 
-import '../../static/css/editablestringlist.css';
-
 export default class EditableStringList extends React.Component {
     constructor(props) {
         super(props);
diff --git a/js/components/ErrorComponents.js b/js/components/ErrorComponents.js
index fb55c75..89a0a7f 100644
--- a/js/components/ErrorComponents.js
+++ b/js/components/ErrorComponents.js
@@ -7,9 +7,6 @@ import {Footer} from './Footer';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../../static/css/everypage.css';
-import '../../static/css/error.css';
-
 export class ErrorPageComponent extends React.Component {
     static getInitialProps({statusCode}) {
         return {statusCode};
diff --git a/js/components/Login.js b/js/components/Login.js
index e2b5026..c2a0cd3 100644
--- a/js/components/Login.js
+++ b/js/components/Login.js
@@ -5,7 +5,6 @@ import Router from 'next/router';
 
 import {login} from '../api';
 
-import '../../static/css/errormessages.css';
 import {notify} from 'react-notify-toast';
 
 export function Login(props) {
diff --git a/js/components/NumericInput.js b/js/components/NumericInput.js
index 478f2cb..f49c841 100644
--- a/js/components/NumericInput.js
+++ b/js/components/NumericInput.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {Button, InputGroup, InputGroupAddon, Input} from 'reactstrap';
-import '../../static/css/numericinput.css';
 
 export default class NumericInput extends React.Component {
     render() {
diff --git a/next.config.js b/next.config.js
index bc76b7e..927144d 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,6 +1,3 @@
-
-const withCSS = require('@zeit/next-css');
-module.exports = withCSS();
 module.exports.publicRuntimeConfig = {
     api_url: process.env.TURNIERE_API_URL
 };
diff --git a/pages/_app.js b/pages/_app.js
index 6bc4dcb..a0a6cf3 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -7,6 +7,15 @@ import Favicon from 'react-favicon';
 import withReduxStore from '../js/redux/reduxStoreBinder';
 import {verifyCredentials} from '../js/api.js';
 
+import '../public/static/css/errormessages.css';
+import '../public/static/css/editablestringlist.css';
+import '../public/static/css/everypage.css';
+import '../public/static/css/error.css';
+import '../public/static/css/numericinput.css';
+import '../public/static/css/index.css';
+import '../public/static/css/profile.css';
+import '../public/static/css/tournament.css';
+
 class TurniereApp extends App {
     componentDidMount() {
         verifyCredentials();
diff --git a/pages/create.js b/pages/create.js
index 50b56e8..1729d13 100644
--- a/pages/create.js
+++ b/pages/create.js
@@ -23,7 +23,6 @@ import {createTournament} from '../js/api';
 import {WarningPopup} from '../js/components/WarningPopup';
 import Router from 'next/router';
 
-import '../static/css/everypage.css';
 import RequireLogin from '../js/components/RequireLogin';
 import NumericInput from '../js/components/NumericInput';
 
diff --git a/pages/faq.js b/pages/faq.js
index c23cad2..71c54f7 100644
--- a/pages/faq.js
+++ b/pages/faq.js
@@ -8,8 +8,6 @@ import {Footer} from '../js/components/Footer';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../static/css/everypage.css';
-
 function Main() {
     return (<div className="main">
         <Container className="pb-5">
diff --git a/pages/imprint.js b/pages/imprint.js
index 71db190..729faec 100644
--- a/pages/imprint.js
+++ b/pages/imprint.js
@@ -7,7 +7,6 @@ import {BigImage} from '../js/components/BigImage';
 import {Footer} from '../js/components/Footer';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
-import '../static/css/everypage.css';
 
 function Main() {
     return (<div className="main running-text">
diff --git a/pages/index.js b/pages/index.js
index 307b7b6..a215d5f 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -11,9 +11,6 @@ import {Footer} from '../js/components/Footer';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../static/css/everypage.css';
-import '../static/css/index.css';
-
 function Main() {
     return (<div className="main">
         <Marketing/>
diff --git a/pages/list.js b/pages/list.js
index 84dcbae..13c70cd 100644
--- a/pages/list.js
+++ b/pages/list.js
@@ -5,7 +5,6 @@ import {Card, CardBody, Container} from 'reactstrap';
 import {TurniereNavigation} from '../js/components/Navigation';
 import {Footer} from '../js/components/Footer';
 
-import '../static/css/everypage.css';
 import TournamentList from '../js/components/TournamentList';
 import {connect} from 'react-redux';
 
diff --git a/pages/login.js b/pages/login.js
index 20d17a9..07557d2 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -5,8 +5,6 @@ import {TurniereNavigation} from '../js/components/Navigation';
 import {Footer} from '../js/components/Footer';
 import {Login} from '../js/components/Login';
 
-import '../static/css/everypage.css';
-
 export default class LoginPage extends React.Component {
     render() {
         return (<div className="main generic-fullpage-bg">
diff --git a/pages/privacy.js b/pages/privacy.js
index bf8bd73..1e907e8 100644
--- a/pages/privacy.js
+++ b/pages/privacy.js
@@ -8,8 +8,6 @@ import {Footer} from '../js/components/Footer';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../static/css/everypage.css';
-
 function Main() {
     return (<div className="main running-text">
         <PrivacyText/>
diff --git a/pages/private.js b/pages/private.js
index c7a5200..acc5ea4 100644
--- a/pages/private.js
+++ b/pages/private.js
@@ -7,7 +7,6 @@ import {Card, CardBody, Container} from 'reactstrap';
 import {TurniereNavigation} from '../js/components/Navigation';
 import {Footer} from '../js/components/Footer';
 
-import '../static/css/everypage.css';
 import TournamentList from '../js/components/TournamentList';
 import RequireLogin from '../js/components/RequireLogin';
 
diff --git a/pages/profile.js b/pages/profile.js
index 4b51c40..c8b7373 100644
--- a/pages/profile.js
+++ b/pages/profile.js
@@ -8,8 +8,6 @@ import {Footer} from '../js/components/Footer';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../static/css/everypage.css';
-import '../static/css/profile.css';
 import {connect} from 'react-redux';
 import {changeMail} from '../js/api';
 import {notify} from 'react-notify-toast';
diff --git a/pages/register.js b/pages/register.js
index 2d84200..b860241 100644
--- a/pages/register.js
+++ b/pages/register.js
@@ -13,9 +13,6 @@ import {TurniereNavigation} from '../js/components/Navigation';
 import {Footer} from '../js/components/Footer';
 import {register} from '../js/api';
 
-import '../static/css/errormessages.css';
-import '../static/css/everypage.css';
-
 export default class RegisterPage extends React.Component {
     render() {
         return (<div className="main generic-fullpage-bg">
diff --git a/pages/tournament-edit.js b/pages/tournament-edit.js
index aa3c1df..9888343 100644
--- a/pages/tournament-edit.js
+++ b/pages/tournament-edit.js
@@ -17,8 +17,6 @@ import {updateTeamName} from '../js/api';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../static/css/everypage.css';
-import '../static/css/index.css';
 import {LoadingPage} from '../js/components/LoadingPage';
 
 class EditTournamentPage extends React.Component {
diff --git a/pages/tournament.js b/pages/tournament.js
index 7fa6b53..3f76656 100644
--- a/pages/tournament.js
+++ b/pages/tournament.js
@@ -10,8 +10,6 @@ import {TurniereNavigation} from '../js/components/Navigation';
 
 import 'bootstrap/dist/css/bootstrap.min.css';
 
-import '../static/css/everypage.css';
-import '../static/css/tournament.css';
 import {PlayoffStages} from '../js/components/PlayoffStages';
 import GroupStage from '../js/components/GroupStage';
 import {TournamentBigImage} from '../js/components/TournamentBigImage';