Merge branch 'master' into ticket/TURNIERE-104
This commit is contained in:
Jonny
GitHub
commit
4dd5298176
|
|
@ -0,0 +1,38 @@
|
|||
{
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es6": true,
|
||||
"node": true
|
||||
},
|
||||
"plugins": [
|
||||
"react"
|
||||
],
|
||||
"extends": "eslint:recommended",
|
||||
"parserOptions": {
|
||||
"ecmaVersion": 2018,
|
||||
"sourceType": "module",
|
||||
"ecmaFeatures": {
|
||||
"jsx": true
|
||||
}
|
||||
},
|
||||
"rules": {
|
||||
"react/jsx-uses-react": "error",
|
||||
"react/jsx-uses-vars": "error",
|
||||
"indent": [
|
||||
"error",
|
||||
4
|
||||
],
|
||||
"linebreak-style": [
|
||||
"error",
|
||||
"unix"
|
||||
],
|
||||
"quotes": [
|
||||
"error",
|
||||
"single"
|
||||
],
|
||||
"semi": [
|
||||
"error",
|
||||
"always"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fail_on_violations: true
|
||||
|
||||
jshint:
|
||||
enabled: false
|
||||
|
||||
eslint:
|
||||
enabled: true
|
||||
config_file: .eslintrc.json
|
||||
|
|
@ -11,9 +11,11 @@ import {
|
|||
NavLink
|
||||
} from 'reactstrap';
|
||||
|
||||
import { connect } from 'react-redux'
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import React from "react";
|
||||
import React from 'react';
|
||||
|
||||
import { logout } from './api';
|
||||
|
||||
export function BigImage(props) {
|
||||
return (
|
||||
|
|
@ -74,23 +76,14 @@ function Betabadge() {
|
|||
|
||||
class InvisibleLoginLogoutButtons extends React.Component {
|
||||
|
||||
logoutClick() {
|
||||
console.log("Logged out.");
|
||||
|
||||
/*
|
||||
/users/sign_out <- DELETE Token invalidieren
|
||||
/users/validate_token <- GET Token valide?
|
||||
*/
|
||||
}
|
||||
|
||||
render() {
|
||||
const { isSignedIn, username, logout } = this.props
|
||||
const { isSignedIn, username } = this.props;
|
||||
|
||||
if(isSignedIn) {
|
||||
return (
|
||||
<ButtonGroup className="nav-item">
|
||||
<Button href="/profile" className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">{ username }</Button>
|
||||
<Button onClick={this.logoutClick} className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">Logout</Button>
|
||||
<Button onClick={logout.bind(this)} className="btn navbar-btn btn-outline-success my-2 my-sm-0 px-5">Logout</Button>
|
||||
</ButtonGroup>
|
||||
);
|
||||
} else {
|
||||
|
|
@ -107,12 +100,12 @@ class InvisibleLoginLogoutButtons extends React.Component {
|
|||
|
||||
const mapStateToLoginLogoutButtonProperties = (state) => {
|
||||
const { isSignedIn, username } = state.userinfo;
|
||||
return { isSignedIn, username }
|
||||
}
|
||||
return { isSignedIn, username };
|
||||
};
|
||||
|
||||
const LoginLogoutButtons = connect(
|
||||
mapStateToLoginLogoutButtonProperties
|
||||
)(InvisibleLoginLogoutButtons)
|
||||
)(InvisibleLoginLogoutButtons);
|
||||
|
||||
export function Footer() {
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import React from "react";
|
||||
import {Alert, Button, Input, InputGroup, InputGroupAddon} from "reactstrap";
|
||||
import React from 'react';
|
||||
import { Alert, Button, Input, InputGroup, InputGroupAddon } from 'reactstrap';
|
||||
|
||||
export default class EditableStringList extends React.Component {
|
||||
constructor(props) {
|
||||
|
|
@ -31,17 +31,14 @@ export default class EditableStringList extends React.Component {
|
|||
if ((typeof this.state.entries !== 'undefined') && this.state.entries.length > 0) {
|
||||
return (
|
||||
<div className="bg-light p-3 text-secondary font-italic">
|
||||
<StringInput submit={this.add} placeholder={this.props.inputPlaceholder}
|
||||
addButtonText={this.props.addButtonText}/>
|
||||
{this.state.entries.map((text) => <Item text={text} key={text}
|
||||
removeItem={this.remove}/>)}
|
||||
<StringInput submit={this.add} placeholder={this.props.inputPlaceholder} addButtonText={this.props.addButtonText}/>
|
||||
{this.state.entries.map((text) => <Item text={text} key={text} removeItem={this.remove}/>)}
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<div className="bg-light p-3 text-secondary text-center font-italic">
|
||||
<StringInput submit={this.add} placeholder={this.props.inputPlaceholder}
|
||||
addButtonText={this.props.addButtonText}/>
|
||||
<StringInput submit={this.add} placeholder={this.props.inputPlaceholder} addButtonText={this.props.addButtonText}/>
|
||||
{this.props.placeholder}
|
||||
</div>
|
||||
);
|
||||
|
|
@ -64,8 +61,7 @@ class StringInput extends React.Component {
|
|||
render() {
|
||||
return (
|
||||
<InputGroup className="mb-3">
|
||||
<Input placeholder={this.props.placeholder} type="text" size="255" value={this.state.value} required
|
||||
onChange={this.handleChange} onKeyPress={(e) => {
|
||||
<Input placeholder={this.props.placeholder} type="text" size="255" value={this.state.value} required onChange={this.handleChange} onKeyPress={(e) => {
|
||||
if (e.key === 'Enter') {
|
||||
this.submit();
|
||||
return false;
|
||||
|
|
@ -73,10 +69,10 @@ class StringInput extends React.Component {
|
|||
}}/>
|
||||
<InputGroupAddon addonType="append">
|
||||
<Button color="success" outline={true}
|
||||
onClick={(e) => this.submit()}>{this.props.addButtonText}</Button>
|
||||
onClick={() => this.submit()}>{this.props.addButtonText}</Button>
|
||||
</InputGroupAddon>
|
||||
</InputGroup>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
submit() {
|
||||
|
|
|
|||
111
js/api.js
111
js/api.js
|
|
@ -1,13 +1,12 @@
|
|||
import { createStore, applyMiddleware, combineReducers } from 'redux'
|
||||
import { composeWithDevTools } from 'redux-devtools-extension'
|
||||
import thunkMiddleware from 'redux-thunk'
|
||||
import { errorMessages } from './constants'
|
||||
import { createStore, applyMiddleware, combineReducers } from 'redux';
|
||||
import { composeWithDevTools } from 'redux-devtools-extension';
|
||||
import thunkMiddleware from 'redux-thunk';
|
||||
import { errorMessages } from './constants';
|
||||
|
||||
const axios = require('axios');
|
||||
|
||||
const api_url = 'https://api.turnie.re';
|
||||
|
||||
|
||||
const actiontypes_userinfo = {
|
||||
'REGISTER' : 'REGISTER',
|
||||
'REGISTER_RESULT_SUCCESS' : 'REGISTER_RESULT_SUCCESS',
|
||||
|
|
@ -17,10 +16,17 @@ const actiontypes_userinfo = {
|
|||
'LOGIN_RESULT_SUCCESS' : 'LOGIN_RESULT_SUCCESS',
|
||||
'LOGIN_RESULT_ERROR' : 'LOGIN_RESULT_ERROR',
|
||||
|
||||
'LOGOUT' : 'LOGOUT',
|
||||
|
||||
'VERIFY_CREDENTIALS' : 'VERIFY_CREDENTIALS',
|
||||
'VERIFY_CREDENTIALS_SUCCESS' : 'VERIFY_CREDENTIALS_SUCCESS',
|
||||
'VERIFY_CREDENTIALS_ERROR' : 'VERIFY_CREDENTIALS_ERROR',
|
||||
|
||||
'STORE_AUTH_HEADERS' : 'STORE_AUTH_HEADERS',
|
||||
|
||||
'REHYDRATE' : 'USERINFO_REHYDRATE',
|
||||
}
|
||||
'CLEAR' : 'USERINFO_CLEAR',
|
||||
};
|
||||
|
||||
const defaultstate_userinfo = {
|
||||
isSignedIn : false,
|
||||
|
|
@ -32,33 +38,32 @@ const defaultstate_userinfo = {
|
|||
client : null,
|
||||
expiry : null,
|
||||
uid : null
|
||||
}
|
||||
};
|
||||
|
||||
export function postRequest(url, data) {
|
||||
export function postRequest(state, url, data) {
|
||||
return axios.post(api_url + url, data, {
|
||||
headers : generateHeaders()
|
||||
headers : generateHeaders(state)
|
||||
});
|
||||
}
|
||||
|
||||
export function getRequest(url, data) {
|
||||
return axios.get(api_url + url, data, {
|
||||
headers : generateHeaders()
|
||||
export function getRequest(state, url) {
|
||||
return axios.get(api_url + url, {
|
||||
headers : generateHeaders(state)
|
||||
});
|
||||
}
|
||||
|
||||
export function deleteRequest(url, data) {
|
||||
return axios.delete(api_url + url, data, {
|
||||
headers : generateHeaders()
|
||||
export function deleteRequest(state, url) {
|
||||
return axios.delete(api_url + url, {
|
||||
headers : generateHeaders(state)
|
||||
});
|
||||
}
|
||||
|
||||
function generateHeaders() {
|
||||
var userinfostate = __store.getState().userinfo;
|
||||
if(userinfostate.isSignedIn) {
|
||||
function generateHeaders(state) {
|
||||
if(state.isSignedIn) {
|
||||
return {
|
||||
'access-token' : userinfostate.accesstoken,
|
||||
'client' : userinfostate.client,
|
||||
'uid' : userinfostate.uid
|
||||
'access-token' : state.accesstoken,
|
||||
'client' : state.client,
|
||||
'uid' : state.uid
|
||||
};
|
||||
} else {
|
||||
return {};
|
||||
|
|
@ -70,26 +75,26 @@ function storeOptionalToken(response) {
|
|||
__store.dispatch({
|
||||
type : actiontypes_userinfo.STORE_AUTH_HEADERS,
|
||||
parameters : {
|
||||
accesstoken : resp.headers['access-token'],
|
||||
client : resp.headers['client'],
|
||||
expiry : resp.headers['expiry'],
|
||||
uid : resp.headers['uid']
|
||||
accesstoken : response.headers['access-token'],
|
||||
client : response.headers['client'],
|
||||
expiry : response.headers['expiry'],
|
||||
uid : response.headers['uid']
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function checkForAuthenticationHeaders(response) {
|
||||
if(response.headers) {
|
||||
const requiredHeaders = [
|
||||
'access-token', 'client', 'uid', 'expiry', // TODO: Add last header that is required (I don't remember it right now lol)
|
||||
'access-token', 'client', 'uid', 'expiry'
|
||||
];
|
||||
for(var i = 0; i < requiredHeaders.length; i++) {
|
||||
if(!response.headers[requiredHeaders[i]]) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -97,7 +102,7 @@ function checkForAuthenticationHeaders(response) {
|
|||
const reducer_userinfo = (state = defaultstate_userinfo, action) => {
|
||||
switch(action.type) {
|
||||
case actiontypes_userinfo.REGISTER:
|
||||
postRequest('/users', {
|
||||
postRequest(state, '/users', {
|
||||
'username' : action.parameters.username,
|
||||
'email' : action.parameters.email,
|
||||
'password' : action.parameters.password
|
||||
|
|
@ -123,7 +128,7 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
|
|||
errorMessages['registration_errorunknown']['en']
|
||||
]
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
});
|
||||
return Object.assign({}, state, {});
|
||||
|
|
@ -138,7 +143,7 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
|
|||
errorMessages : action.parameters.errorMessages
|
||||
});
|
||||
case actiontypes_userinfo.LOGIN:
|
||||
postRequest('/users/sign_in', {
|
||||
postRequest(state, '/users/sign_in', {
|
||||
email : action.parameters.email,
|
||||
password : action.parameters.password
|
||||
}).then((resp) => {
|
||||
|
|
@ -180,6 +185,13 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
|
|||
error : true,
|
||||
errorMessages : action.parameters.errorMessages
|
||||
});
|
||||
case actiontypes_userinfo.LOGOUT:
|
||||
deleteRequest(state, '/users/sign_out').then(() => {
|
||||
__store.dispatch({ type : actiontypes_userinfo.CLEAR });
|
||||
}).catch(() => {
|
||||
__store.dispatch({ type : actiontypes_userinfo.CLEAR });
|
||||
});
|
||||
return Object.assign({}, state, {});
|
||||
case actiontypes_userinfo.STORE_AUTH_HEADERS:
|
||||
return Object.assign({}, state, {
|
||||
accesstoken : action.parameters.accesstoken,
|
||||
|
|
@ -187,19 +199,38 @@ const reducer_userinfo = (state = defaultstate_userinfo, action) => {
|
|||
expiry : action.parameters.expiry,
|
||||
uid : action.parameters.uid
|
||||
});
|
||||
case actiontypes_userinfo.VERIFY_CREDENTIALS:
|
||||
getRequest(state, '/users/validate_token').then((resp) => {
|
||||
storeOptionalToken(resp);
|
||||
}).catch(() => {
|
||||
__store.dispatch({ type: actiontypes_userinfo.CLEAR });
|
||||
});
|
||||
return Object.assign({}, state, {});
|
||||
case actiontypes_userinfo.REHYDRATE:
|
||||
return Object.assign({}, state, action.parameters);
|
||||
case actiontypes_userinfo.CLEAR:
|
||||
return Object.assign({}, state, {
|
||||
isSignedIn : false,
|
||||
username : null,
|
||||
error : false,
|
||||
errorMessages : [],
|
||||
|
||||
accesstoken : null,
|
||||
client : null,
|
||||
expiry : null,
|
||||
uid : null
|
||||
});
|
||||
default: return state;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const reducers = {
|
||||
userinfo: reducer_userinfo
|
||||
}
|
||||
};
|
||||
|
||||
const default_applicationstate = {
|
||||
userinfo : defaultstate_userinfo
|
||||
}
|
||||
};
|
||||
|
||||
var __store;
|
||||
|
||||
|
|
@ -210,7 +241,7 @@ export function initializeStore(initialState = default_applicationstate) {
|
|||
composeWithDevTools(applyMiddleware(thunkMiddleware))
|
||||
);
|
||||
__store.subscribe(() => {
|
||||
localStorage.setItem('reduxState', JSON.stringify(__store.getState()))
|
||||
localStorage.setItem('reduxState', JSON.stringify(__store.getState()));
|
||||
});
|
||||
return __store;
|
||||
}
|
||||
|
|
@ -218,7 +249,9 @@ export function initializeStore(initialState = default_applicationstate) {
|
|||
export function verifyCredentials() {
|
||||
rehydrateApplicationState();
|
||||
|
||||
// TODO: Actually perform a verification of the loaded credentials
|
||||
if(__store.getState().userinfo.isSignedIn) {
|
||||
__store.dispatch({ type: actiontypes_userinfo.VERIFY_CREDENTIALS });
|
||||
}
|
||||
}
|
||||
|
||||
export function register(username, email, password) {
|
||||
|
|
@ -239,7 +272,11 @@ export function login(email, password) {
|
|||
email: email,
|
||||
password: password
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
export function logout() {
|
||||
__store.dispatch({ type : actiontypes_userinfo.LOGOUT });
|
||||
}
|
||||
|
||||
export function getState() {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import React from "react";
|
||||
import React from 'react';
|
||||
|
||||
export function BigImage(props) {
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@ export const errorMessages = {
|
|||
login_errorunknown : {
|
||||
en : 'An unknown error prevented a successful login.'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
import React from 'react'
|
||||
import { initializeStore } from '../api'
|
||||
import React from 'react';
|
||||
import { initializeStore } from '../api';
|
||||
|
||||
const isServer = typeof window === 'undefined'
|
||||
const __NEXT_REDUX_STORE__ = '__NEXT_REDUX_STORE__'
|
||||
const isServer = typeof window === 'undefined';
|
||||
const __NEXT_REDUX_STORE__ = '__NEXT_REDUX_STORE__';
|
||||
|
||||
function getOrCreateStore (initialState) {
|
||||
// Always make a new store if server, otherwise state is shared between requests
|
||||
if (isServer) {
|
||||
return initializeStore(initialState)
|
||||
return initializeStore(initialState);
|
||||
}
|
||||
|
||||
// Create store if unavailable on the client and set it on the window object
|
||||
if (!window[__NEXT_REDUX_STORE__]) {
|
||||
window[__NEXT_REDUX_STORE__] = initializeStore(initialState)
|
||||
window[__NEXT_REDUX_STORE__] = initializeStore(initialState);
|
||||
}
|
||||
return window[__NEXT_REDUX_STORE__]
|
||||
return window[__NEXT_REDUX_STORE__];
|
||||
}
|
||||
|
||||
export default (App) => {
|
||||
|
|
@ -22,29 +22,29 @@ export default (App) => {
|
|||
static async getInitialProps (appContext) {
|
||||
// Get or Create the store with `undefined` as initialState
|
||||
// This allows you to set a custom default initialState
|
||||
const reduxStore = getOrCreateStore()
|
||||
const reduxStore = getOrCreateStore();
|
||||
|
||||
// Provide the store to getInitialProps of pages
|
||||
appContext.ctx.reduxStore = reduxStore
|
||||
appContext.ctx.reduxStore = reduxStore;
|
||||
|
||||
let appProps = {}
|
||||
let appProps = {};
|
||||
if (typeof App.getInitialProps === 'function') {
|
||||
appProps = await App.getInitialProps(appContext)
|
||||
appProps = await App.getInitialProps(appContext);
|
||||
}
|
||||
|
||||
return {
|
||||
...appProps,
|
||||
initialReduxState: reduxStore.getState()
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
constructor (props) {
|
||||
super(props)
|
||||
this.reduxStore = getOrCreateStore(props.initialReduxState)
|
||||
super(props);
|
||||
this.reduxStore = getOrCreateStore(props.initialReduxState);
|
||||
}
|
||||
|
||||
render () {
|
||||
return <App {...this.props} reduxStore={this.reduxStore} />
|
||||
}
|
||||
}
|
||||
return <App {...this.props} reduxStore={this.reduxStore} />;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
|
||||
const withCSS = require('@zeit/next-css')
|
||||
module.exports = withCSS()
|
||||
const withCSS = require('@zeit/next-css');
|
||||
module.exports = withCSS();
|
||||
|
|
@ -27,6 +27,8 @@
|
|||
"redux-thunk": "^2.3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"eslint": "^5.9.0",
|
||||
"eslint-plugin-react": "^7.11.1",
|
||||
"react-editable-list": "0.0.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import App, {Container} from 'next/app'
|
||||
import React from 'react'
|
||||
import { Provider } from 'react-redux'
|
||||
import withReduxStore from '../js/redux/reduxStoreBinder'
|
||||
import { verifyCredentials } from '../js/api'
|
||||
import App, {Container} from 'next/app';
|
||||
import React from 'react';
|
||||
import { Provider } from 'react-redux';
|
||||
import withReduxStore from '../js/redux/reduxStoreBinder';
|
||||
import { verifyCredentials } from '../js/api';
|
||||
|
||||
class TurniereApp extends App {
|
||||
|
||||
|
|
@ -11,15 +11,15 @@ class TurniereApp extends App {
|
|||
}
|
||||
|
||||
render () {
|
||||
const {Component, pageProps, reduxStore} = this.props
|
||||
const {Component, pageProps, reduxStore} = this.props;
|
||||
return (
|
||||
<Container>
|
||||
<Provider store={reduxStore}>
|
||||
<Component {...pageProps} />
|
||||
</Provider>
|
||||
</Container>
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default withReduxStore(TurniereApp)
|
||||
export default withReduxStore(TurniereApp);
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
import Head from 'next/head'
|
||||
import React from 'react'
|
||||
import {Footer, TurniereNavigation} from "../js/CommonComponents";
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
import {Footer, TurniereNavigation} from '../js/CommonComponents';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
import {Container} from "reactstrap";
|
||||
import '../static/everypage.css'
|
||||
import '../static/css/error.css'
|
||||
import {Container} from 'reactstrap';
|
||||
import '../static/everypage.css';
|
||||
import '../static/css/error.css';
|
||||
|
||||
export default class Error extends React.Component {
|
||||
static getInitialProps({ res, err }) {
|
||||
const statusCode = res ? res.statusCode : err ? err.statusCode : 400;
|
||||
return { statusCode }
|
||||
return { statusCode };
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
@ -22,7 +22,7 @@ export default class Error extends React.Component {
|
|||
<ErrorPage statusCode={this.props.statusCode}/>
|
||||
<Footer/>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,22 @@
|
|||
import Head from 'next/head'
|
||||
import '../static/everypage.css'
|
||||
import {Footer, TurniereNavigation} from "../js/CommonComponents";
|
||||
import React from "react";
|
||||
import {Button, Card, CardBody, Container, CustomInput, Fade, Form, FormGroup, Input, Label} from "reactstrap";
|
||||
import EditableStringList from "../js/EditableStringList";
|
||||
import Head from 'next/head';
|
||||
import '../static/everypage.css';
|
||||
import { Footer, TurniereNavigation } from '../js/CommonComponents';
|
||||
import React from 'react';
|
||||
|
||||
import {
|
||||
Button,
|
||||
Card,
|
||||
CardBody,
|
||||
Container,
|
||||
CustomInput,
|
||||
Fade,
|
||||
Form,
|
||||
FormGroup,
|
||||
Input,
|
||||
Label
|
||||
} from 'reactstrap';
|
||||
|
||||
import EditableStringList from '../js/EditableStringList';
|
||||
|
||||
export default () => (
|
||||
<div className="main generic-fullpage-bg">
|
||||
|
|
@ -16,7 +29,7 @@ export default () => (
|
|||
</div>
|
||||
<Footer/>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
|
||||
function CreateTournamentCard() {
|
||||
return (
|
||||
|
|
|
|||
58
pages/faq.js
58
pages/faq.js
|
|
@ -1,9 +1,9 @@
|
|||
import Head from 'next/head'
|
||||
import React from 'react'
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
import {Col, Container, Row} from 'reactstrap';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
import {BigImage, Footer, TurniereNavigation} from '../js/CommonComponents.js'
|
||||
import '../static/everypage.css'
|
||||
import { BigImage, Footer, TurniereNavigation } from '../js/CommonComponents.js';
|
||||
import '../static/everypage.css';
|
||||
|
||||
function Main() {
|
||||
return (
|
||||
|
|
@ -33,19 +33,22 @@ function GeneralFaq() {
|
|||
mit allen Leuten teilen kannst, ohne dir Gedanken machen zu müssen, wer gegen wen spielen
|
||||
muss. Du trägst ein, wer gewonnen hat, und turnie.re sagt, wer als nächstes spielt.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Für welche Sportarten ist turnie.re geeignet?</h4>
|
||||
<p>
|
||||
turnie.re ist prinzipiell für jede Sportart geeignet. Die einzige Vor­aus­setzung ist, dass
|
||||
in jedem Spiel zwei Mannschaften oder Spieler gegeinander antreten und dass derjenige mit
|
||||
den meisten Punkten gewinnt.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Für welche Anzahl an Teams ist turnie.re geeignet?</h4>
|
||||
<p>
|
||||
turnie.re ist unabhängig von der Anzahl der Teams nutzbar.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Fallen für die Nutzung von turnie.re Kosten an?</h4>
|
||||
<p>
|
||||
turnie.re ist ein kostenloser Service! Wir erheben keine Kosten und sind nur darauf aus,
|
||||
|
|
@ -69,34 +72,40 @@ function AccountFaq() {
|
|||
dich als berechtigt verifizieren können, benötigst du einen Acoount, sodass wir dir die
|
||||
entsprechenden Bearbeitungsrechte zuteilen können.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Welche Daten muss ich bei der Accounterstellung angeben?</h4>
|
||||
<p>
|
||||
Um einen Account anzulegen musst du einen Nutzernamen, eine gültige E-Mailadresse sowie ein
|
||||
Passwort angeben.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Wie werden meine Daten verarbeitet?</h4>
|
||||
<p>
|
||||
Deine Daten werden in unserer Datenbank gespeichert. Eine Weitergabe dieser Daten an Dritte
|
||||
erfolgt nicht!</p>
|
||||
erfolgt nicht!
|
||||
</p>
|
||||
<p>
|
||||
Zusätlich wird dein Passwort verschlüsselt gespeichert, das bedeutet auch wir kennen dein
|
||||
Passwort nicht und dein Account wird zuverlässig geschützt.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Wie kann ich meinen Nutzernamen ändern?</h4>
|
||||
<p>
|
||||
Über deinen Nutzernamen, der in der Kopfzeile angezeigt wird, gelangst du auf deine
|
||||
Profilseite. Hier kannst du deinen Nutzernamen ändern.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Wie kann ich meine E-Mailadresse ändern?</h4>
|
||||
<p>
|
||||
Über deinen Nutzernamen, der in der Kopfzeile angezeigt wird, gelangst du auf deine
|
||||
Profilseite. Hier kannst du deine E-Mailadresse ändern ändern.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Wie kann ich mein Passwort ändern?</h4>
|
||||
<p>
|
||||
Auf deiner Profilseite findest du einen "Passwort ändern" Button. Auf der sich dann
|
||||
|
|
@ -121,15 +130,16 @@ function TournamentFaq() {
|
|||
Über "Turnier erstellen" gelangst du auf die "Turnier erstellen" Seite. Auf dieser kannst du
|
||||
deinem Turnier einen Namen geben und eine (optionale) Beschreibung hinzufügen. Dann kannst
|
||||
du dein Turnier <a href="#public-tournament">öffentlich oder privat</a> erstellen, die Teams
|
||||
für die Spielpaarungen <a href="#randomize-teams">mischen</a> lassen und eine <a
|
||||
href="#groupstage">Gruppenphase</a> hinzufügen. Im Feld "Teams" kannst du die
|
||||
für die Spielpaarungen <a href="#randomize-teams">mischen</a> lassen und eine <a href="#groupstage">Gruppenphase</a>
|
||||
hinzufügen. Im Feld "Teams" kannst du die
|
||||
teilnehmenden <a href="#add-teams">Teams
|
||||
eintragen</a> und hinzufügen. </p>
|
||||
<p>
|
||||
Wenn du die Option Gruppenphase aktiviert hast, kannst du zusätzlich noch die Größe der
|
||||
Gruppen angeben.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4 id="public-tournament">Was ist der Unterschied zwischen einem öffentlichen und einem
|
||||
privaten Turnier?</h4>
|
||||
<p>
|
||||
|
|
@ -147,7 +157,8 @@ function TournamentFaq() {
|
|||
Trotzdem bleibt der Turnierersteller der Einzige, der die Turnierinformationen bearbeiten
|
||||
und Spielstände eintragen kann.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4 id="randomize-teams">Was bedeutet "Teams mischen"?</h4>
|
||||
<p>
|
||||
Die Spielpaarungen werden anhand der Eingabereihenfolge der Teams erstellt. So spielt z.B.
|
||||
|
|
@ -157,7 +168,8 @@ function TournamentFaq() {
|
|||
Wenn du das nicht möchtest kannst du die Option "Teams mischen" aktivieren und die
|
||||
Spielpaarungen werden in einer zufälligen Reihenfolge erstellt.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4 id="groupstage">Was passiert wenn ich die Gruppenphase aktiviere?</h4>
|
||||
<p>
|
||||
Grundsätzlich erstellt turnie.re dir einen Spielplan für ein Turnier <strong>ohne</strong>
|
||||
|
|
@ -168,7 +180,8 @@ function TournamentFaq() {
|
|||
<p>
|
||||
Bitte beachte, dass die Anzahl der Teams durch die Gruppengröße teilbar sein muss.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4 id="add-teams">Wie kann ich Teams hinzufügen?</h4>
|
||||
<p>
|
||||
Auf der "Turnier erstellen" Seite kannst du im Feld "Teams" deine Teams eintragen. </p>
|
||||
|
|
@ -177,14 +190,15 @@ function TournamentFaq() {
|
|||
Button "Team hinzufügen" das Team deinem Turnier hinzufügen. Du kannst aber auch deine Teams
|
||||
als eine mit Kommas getrennte Liste eingeben und dann hinzufügen.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Wie starte ich ein Spiel?</h4>
|
||||
<p>
|
||||
Auf der Turnierübersicht Seite gibt es für jede Partie einen "Spiel starten" Button. Über
|
||||
diesen kannst du einfach das jeweilige Spiel starten.
|
||||
</p>
|
||||
</Col><Col sm="4">
|
||||
</Col>
|
||||
<Col sm="4">
|
||||
<h4>Wie trage ich einen Spielstand für eine Partie ein?</h4>
|
||||
<p>
|
||||
Auf der Turnierübersicht Seite gibt es für jede Partie einen "Spielstand ändern" Button.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
import Head from 'next/head'
|
||||
import React from 'react'
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
import {Container} from 'reactstrap';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
import {BigImage, Footer, TurniereNavigation} from '../js/CommonComponents.js'
|
||||
import '../static/everypage.css'
|
||||
import {BigImage, Footer, TurniereNavigation} from '../js/CommonComponents.js';
|
||||
import '../static/everypage.css';
|
||||
|
||||
function Main() {
|
||||
return (
|
||||
|
|
@ -14,7 +14,8 @@ function Main() {
|
|||
}
|
||||
|
||||
function ImprintText(){
|
||||
return (<Container>
|
||||
return (
|
||||
<Container>
|
||||
<h3>
|
||||
Angaben gemäß §5 TMG:
|
||||
</h3>
|
||||
|
|
@ -24,22 +25,16 @@ function ImprintText(){
|
|||
76133 Karlsruhe<br/>
|
||||
Germany<br/>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<strong>Vertreten durch</strong><br/>
|
||||
Jonas Seydel
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<strong>Kontakt</strong><br/>
|
||||
jon@s-seydel.de
|
||||
</p>
|
||||
|
||||
|
||||
<h3>Haftungsausschluss</h3>
|
||||
|
||||
<h4>Haftung für Inhalte</h4>
|
||||
|
||||
<p>
|
||||
Die Inhalte unserer Seiten wurden mit größter Sorgfalt erstellt. Für die Richtigkeit, Vollständigkeit und Aktualität
|
||||
der Inhalte können wir jedoch keine Gewähr übernehmen. Als Diensteanbieter sind wir gemäß § 7 Abs.1 TMG für eigene
|
||||
|
|
@ -50,9 +45,7 @@ function ImprintText(){
|
|||
jedoch erst ab dem Zeitpunkt der Kenntnis einer konkreten Rechtsverletzung möglich. Bei Bekanntwerden von
|
||||
entsprechenden Rechtsverletzungen werden wir diese Inhalte umgehend entfernen.
|
||||
</p>
|
||||
|
||||
<h4>Haftung für Links</h4>
|
||||
|
||||
<p>
|
||||
Unser Angebot enthält Links zu externen Webseiten Dritter, auf deren Inhalte wir keinen Einfluss haben. Deshalb können
|
||||
wir für diese fremden Inhalte auch keine Gewähr übernehmen. Für die Inhalte der verlinkten Seiten ist stets der
|
||||
|
|
@ -61,9 +54,7 @@ function ImprintText(){
|
|||
permanente inhaltliche Kontrolle der verlinkten Seiten ist jedoch ohne konkrete Anhaltspunkte einer Rechtsverletzung
|
||||
nicht zumutbar. Bei Bekanntwerden von Rechtsverletzungen werden wir derartige Links umgehend entfernen.
|
||||
</p>
|
||||
|
||||
<h4>Urheberrecht</h4>
|
||||
|
||||
<p>
|
||||
Die durch die Seitenbetreiber erstellten Inhalte und Werke auf diesen Seiten unterliegen dem deutschen Urheberrecht.
|
||||
Die Vervielfältigung, Bearbeitung, Verbreitung und jede Art der Verwertung außerhalb der Grenzen des Urheberrechtes
|
||||
|
|
@ -73,9 +64,8 @@ function ImprintText(){
|
|||
gekennzeichnet. Sollten Sie trotzdem auf eine Urheberrechtsverletzung aufmerksam werden, bitten wir um einen
|
||||
entsprechenden Hinweis. Bei Bekanntwerden von Rechtsverletzungen werden wir derartige Inhalte umgehend entfernen.
|
||||
</p>
|
||||
|
||||
|
||||
</Container>);
|
||||
</Container>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
import Head from 'next/head'
|
||||
import React from 'react'
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
|
||||
import { Alert, Button, Card, CardBody } from 'reactstrap';
|
||||
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
|
||||
import { BigImage, Footer, TurniereNavigation } from '../js/CommonComponents.js'
|
||||
import { BigImage, Footer, TurniereNavigation } from '../js/CommonComponents.js';
|
||||
|
||||
import '../static/everypage.css'
|
||||
import '../static/css/index.css'
|
||||
import '../static/everypage.css';
|
||||
import '../static/css/index.css';
|
||||
|
||||
import { connect } from 'react-redux'
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
function Main() {
|
||||
return (
|
||||
|
|
@ -26,7 +26,6 @@ function Marketing() {
|
|||
return (
|
||||
<div className="container marketing my-5">
|
||||
<div className="row">
|
||||
|
||||
<div className="col-lg-4">
|
||||
<h2>Für jede Sportart</h2>
|
||||
<p>
|
||||
|
|
@ -88,12 +87,10 @@ function MainBottomSummary() {
|
|||
<div className="col-lg-6">
|
||||
<h2>Ich habe einen Turniercode bekommen. Was nun?</h2>
|
||||
<p>
|
||||
Der Turniercode führt dich direkt zu einem Turnier. Gebe dafür den Code <a className="text-success"
|
||||
href="#turniercode-form">oben </a>
|
||||
ein, dann wirst du sofort weitergeleitet.
|
||||
Der Turniercode führt dich direkt zu einem Turnier. Gebe dafür den Code
|
||||
<a className="text-success" href="#turniercode-form">oben</a> ein, dann wirst du sofort weitergeleitet.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div className="my-5 text-center">
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
import Head from 'next/head'
|
||||
import '../static/everypage.css'
|
||||
import {Footer, TurniereNavigation} from "../js/CommonComponents";
|
||||
import React from "react";
|
||||
import {Button, Card, CardBody, Container, Form, FormGroup, Input, Label} from "reactstrap";
|
||||
import Head from 'next/head';
|
||||
import '../static/everypage.css';
|
||||
import {Footer, TurniereNavigation} from '../js/CommonComponents';
|
||||
import React from 'react';
|
||||
import { Button, Card, CardBody, Container, Form, FormGroup, Input, Label } from 'reactstrap';
|
||||
import { login } from '../js/api';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
export default () => (
|
||||
<div className="main generic-fullpage-bg">
|
||||
|
|
@ -15,7 +17,7 @@ export default () => (
|
|||
</div>
|
||||
<Footer/>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
|
||||
function Login() {
|
||||
return (
|
||||
|
|
@ -34,18 +36,74 @@ function Login() {
|
|||
);
|
||||
}
|
||||
|
||||
function LoginForm() {
|
||||
class LoginErrorList extends React.Component {
|
||||
render() {
|
||||
const { error, errorMessages } = this.props;
|
||||
if(error) {
|
||||
return (
|
||||
<ul>
|
||||
{ errorMessages.map((message, index) =>
|
||||
<li key={index}>
|
||||
<style jsx>{`
|
||||
li {
|
||||
color:red;
|
||||
}
|
||||
`}</style>
|
||||
{message}
|
||||
</li>
|
||||
|
||||
) }
|
||||
</ul>
|
||||
);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const mapStateToErrorMessages = (state) => {
|
||||
const { errorMessages, error } = state.userinfo;
|
||||
return { errorMessages, error };
|
||||
};
|
||||
|
||||
const VisibleLoginErrorList = connect(
|
||||
mapStateToErrorMessages
|
||||
)(LoginErrorList);
|
||||
|
||||
|
||||
class LoginForm extends React.Component {
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
email : '',
|
||||
password : ''
|
||||
};
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<Form>
|
||||
<FormGroup>
|
||||
<Label for="username">E-Mail-Adresse</Label>
|
||||
<Input type="email" name="username"/>
|
||||
<Input type="email" name="username" value={this.state.email} onChange={ this.handleEmailInput.bind(this) } />
|
||||
</FormGroup>
|
||||
<FormGroup>
|
||||
<Label for="password">Passwort</Label>
|
||||
<Input type="password" name="password"/>
|
||||
<Input type="password" name="password" value={this.state.password} onChange={ this.handlePasswordInput.bind(this) } />
|
||||
</FormGroup>
|
||||
<Button color="success" size="lg" className="w-100 shadow-sm">Anmelden</Button>
|
||||
<Button onClick={login.bind(this, this.state.email, this.state.password)} color="success" size="lg" className="w-100 shadow-sm">Anmelden</Button>
|
||||
<VisibleLoginErrorList/>
|
||||
</Form>
|
||||
);
|
||||
}
|
||||
|
||||
handlePasswordInput(input) {
|
||||
this.setState({ password : input.target.value });
|
||||
}
|
||||
|
||||
handleEmailInput(input) {
|
||||
this.setState({ email : input.target.value });
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
import Head from 'next/head'
|
||||
import React from 'react'
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
import {Container} from 'reactstrap';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
import {BigImage, Footer, TurniereNavigation} from '../js/CommonComponents.js'
|
||||
import '../static/everypage.css'
|
||||
import { BigImage, Footer, TurniereNavigation } from '../js/CommonComponents.js';
|
||||
import '../static/everypage.css';
|
||||
|
||||
function Main() {
|
||||
return (
|
||||
|
|
@ -14,7 +14,8 @@ function Main() {
|
|||
}
|
||||
|
||||
function PrivacyText(){
|
||||
return (<Container>
|
||||
return (
|
||||
<Container>
|
||||
<p>
|
||||
Die nachfolgende Datenschutzerklärung gilt für die Nutzung unseres Online-Angebots turnie.re (nachfolgend
|
||||
„Website“).<br/>
|
||||
|
|
@ -24,8 +25,6 @@ function PrivacyText(){
|
|||
Datenschutzgrundverordnung
|
||||
(DSGVO).
|
||||
</p>
|
||||
|
||||
|
||||
<h3>1 Verantwortlicher</h3>
|
||||
<p>
|
||||
Verantwortlicher für die Erhebung, Verarbeitung und Nutzung Ihrer personenbezogenen Daten im Sinne von Art.
|
||||
|
|
@ -47,16 +46,11 @@ function PrivacyText(){
|
|||
richten.<br/>
|
||||
Sie können diese Datenschutzerklärung jederzeit speichern und ausdrucken.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>2 Allgemeine Zwecke der Verarbeitung</h3>
|
||||
<p>
|
||||
Wir verwenden personenbezogene Daten zum Zweck des Betriebs der Website.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>3 Welche Daten wir verwenden und warum</h3>
|
||||
|
||||
<h4>3.1 Hosting</h4>
|
||||
<p>
|
||||
Die von uns in Anspruch genommenen Hosting-Leistungen dienen der Zurverfügungstellung der folgenden
|
||||
|
|
@ -72,7 +66,6 @@ function PrivacyText(){
|
|||
Art. 6
|
||||
Abs. 1 S. 1 f) DSGVO i.V.m. Art. 28 DSGVO.
|
||||
</p>
|
||||
|
||||
<h4>3.2 Zugriffsdaten</h4>
|
||||
<p>
|
||||
Wir sammeln Informationen über Sie, wenn Sie diese Website nutzen. Wir erfassen automatisch Informationen
|
||||
|
|
@ -124,7 +117,6 @@ function PrivacyText(){
|
|||
Registrierung,
|
||||
Login, Klicken von Links etc.).
|
||||
</p>
|
||||
|
||||
<h4>3.3 Cookies</h4>
|
||||
<p>
|
||||
Wir verwenden sogenannte Session-Cookies, um unsere Website zu optimieren. Ein Session-Cookie ist eine
|
||||
|
|
@ -177,7 +169,6 @@ function PrivacyText(){
|
|||
Cookies
|
||||
komplett verhindert werden. Dadurch kann die Funktionalität der Website eingeschränkt werden.
|
||||
</p>
|
||||
|
||||
<h4>3.4 Nutzerkonto</h4>
|
||||
<p>Sie können auf unserer Website ein Nutzerkonto anlegen. Wünschen Sie dies, so benötigen wir die beim Login
|
||||
abgefragten
|
||||
|
|
@ -199,7 +190,6 @@ function PrivacyText(){
|
|||
Rechtgrundlage für die Verarbeitung dieser Daten ist Ihre Einwilligung gemäß Art. 6 Abs. 1 S. 1 a)
|
||||
DSGVO.
|
||||
</p>
|
||||
|
||||
<h4>3.5 E-Mail Kontakt</h4>
|
||||
<p>
|
||||
Wenn Sie mit uns in Kontakt treten (z. B. per Kontaktformular oder E-Mail), verarbeiten wir Ihre Angaben zur
|
||||
|
|
@ -215,8 +205,6 @@ function PrivacyText(){
|
|||
berechtigtes
|
||||
Interesse liegt z. B. darin, auf Ihre E-Mail zu antworten.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>4 Speicherdauer</h3>
|
||||
<p>
|
||||
Sofern nicht spezifisch angegeben speichern wir personenbezogene Daten nur so lange, wie dies zur Erfüllung
|
||||
|
|
@ -228,8 +216,6 @@ function PrivacyText(){
|
|||
gespeichert,
|
||||
aber nicht anderweitig verarbeitet und nach Ablauf der gesetzlichen Aufbewahrungsfrist gelöscht.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>5 Ihre Rechte als von der Datenverarbeitung Betroffener</h3>
|
||||
<p>
|
||||
Nach den anwendbaren Gesetzen haben Sie verschiedene Rechte bezüglich Ihrer personenbezogenen Daten. Möchten
|
||||
|
|
@ -283,14 +269,12 @@ function PrivacyText(){
|
|||
und die angestrebten Auswirkungen einer derartigen Verarbeitung für Sie.
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<p>
|
||||
Werden personenbezogene Daten an ein Drittland oder an eine internationale Organisation übermittelt, so
|
||||
haben Sie das
|
||||
Recht, über die geeigneten Garantien gemäß Art. 46 DSGVO im Zusammenhang mit der Übermittlung unterrichtet
|
||||
zu werden.
|
||||
</p>
|
||||
|
||||
<h4>5.2 Recht auf Berichtigung</h4>
|
||||
<p>
|
||||
Sie haben das Recht, von uns die Berichtigung und ggf. auch Vervollständigung Sie betreffender
|
||||
|
|
@ -349,7 +333,6 @@ function PrivacyText(){
|
|||
personenbezogenen
|
||||
Daten oder von Kopien oder Replikationen dieser personenbezogenen Daten verlangt haben.
|
||||
</p>
|
||||
|
||||
<h4>5.4 Recht auf Einschränkung der Verarbeitung</h4>
|
||||
<p>
|
||||
In einer Reihe von Fällen sind Sie berechtigt, von uns eine Einschränkung der Verarbeitung Ihrer
|
||||
|
|
@ -378,7 +361,6 @@ function PrivacyText(){
|
|||
ob die berechtigten Gründe unseres Unternehmens gegenüber den Ihren überwiegen.
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<h4>5.5 Recht auf Datenübertragbarkeit</h4>
|
||||
<p>
|
||||
Sie haben das Recht, Sie betreffende personenbezogene Daten maschinenlesbar zu erhalten, zu übermitteln,
|
||||
|
|
@ -405,7 +387,6 @@ function PrivacyText(){
|
|||
technisch
|
||||
machbar ist.
|
||||
</p>
|
||||
|
||||
<h4>5.6 Widerspruchsrecht</h4>
|
||||
<p>
|
||||
Sie haben das Recht, auch einer rechtmäßigen Verarbeitung Ihrer personenbezogenen Daten durch uns zu
|
||||
|
|
@ -434,7 +415,6 @@ function PrivacyText(){
|
|||
oder zu statistischen Zwecken gemäß Art. 89 Abs. 1 DSGVO erfolgt, Widerspruch einzulegen, es sei denn, die
|
||||
Verarbeitung ist zur Erfüllung einer im öffentlichen Interesse liegenden Aufgabe erforderlich.<br/>
|
||||
</p>
|
||||
|
||||
<h4>5.7 Automatisierte Entscheidungen einschließlich Profiling</h4>
|
||||
<p>
|
||||
Sie haben das Recht, nicht einer ausschließlich auf einer automatisierten Verarbeitung – einschließlich
|
||||
|
|
@ -445,7 +425,6 @@ function PrivacyText(){
|
|||
Eine automatisierte Entscheidungsfindung auf der Grundlage der erhobenen personenbezogenen Daten findet
|
||||
nicht statt.
|
||||
</p>
|
||||
|
||||
<h4>5.8 Recht auf Widerruf einer datenschutzrechtlichen Einwilligung</h4>
|
||||
<p>
|
||||
Sie haben das Recht, eine Einwilligung zur Verarbeitung personenbezogener Daten jederzeit zu widerrufen.
|
||||
|
|
@ -458,8 +437,6 @@ function PrivacyText(){
|
|||
dass die
|
||||
Verarbeitung der Sie betreffenden personenbezogenen Daten rechtswidrig ist.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>6 Datensicherheit</h3>
|
||||
<p>
|
||||
Wir sind um die Sicherheit Ihrer Daten im Rahmen der geltenden Datenschutzgesetze und technischen
|
||||
|
|
@ -479,8 +456,6 @@ function PrivacyText(){
|
|||
regelmäßig
|
||||
sorgfältig gesichert.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>7 Weitergabe von Daten an Dritte, keine Datenübertragung ins Nicht-EU-Ausland</h3>
|
||||
<p>
|
||||
Grundsätzlich verwenden wir Ihre personenbezogenen Daten nur innerhalb unseres Unternehmens.<br/>
|
||||
|
|
@ -496,8 +471,6 @@ function PrivacyText(){
|
|||
4
|
||||
genannten Falls findet nicht statt und ist nicht geplant.
|
||||
</p>
|
||||
|
||||
|
||||
<h3>8 Datenschutzbeauftragter</h3>
|
||||
<p>
|
||||
Sollten Sie noch Fragen oder Bedenken zum Datenschutz haben, so wenden Sie sich bitte an unseren
|
||||
|
|
@ -510,8 +483,8 @@ function PrivacyText(){
|
|||
Germany<br/>
|
||||
jon@s-seydel.de
|
||||
</p>
|
||||
|
||||
</Container>);
|
||||
</Container>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
import Head from 'next/head'
|
||||
import '../static/everypage.css'
|
||||
import {Footer, TurniereNavigation} from "../js/CommonComponents";
|
||||
import React from "react";
|
||||
import {Button, Card, CardBody, Container, Form, FormGroup, FormText, Input, Label} from "reactstrap";
|
||||
import Head from 'next/head';
|
||||
import '../static/everypage.css';
|
||||
import {Footer, TurniereNavigation} from '../js/CommonComponents';
|
||||
import React from 'react';
|
||||
import { Button, Card, CardBody, Container, Form, FormGroup, FormText, Input, Label } from 'reactstrap';
|
||||
import { register } from '../js/api';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
export default () => (
|
||||
<div className="main generic-fullpage-bg">
|
||||
|
|
@ -16,7 +18,7 @@ export default () => (
|
|||
</div>
|
||||
<Footer/>
|
||||
</div>
|
||||
)
|
||||
);
|
||||
|
||||
function Register() {
|
||||
return (
|
||||
|
|
@ -34,32 +36,92 @@ function Register() {
|
|||
);
|
||||
}
|
||||
|
||||
function RegisterForm() {
|
||||
class RegisterErrorList extends React.Component {
|
||||
render() {
|
||||
const { error, errorMessages } = this.props;
|
||||
if(error) {
|
||||
return (
|
||||
<ul>
|
||||
{ errorMessages.map((message, index) =>
|
||||
<li key={index}>
|
||||
<style jsx>{`
|
||||
li {
|
||||
color:red;
|
||||
}
|
||||
`}</style>
|
||||
{message}
|
||||
</li>
|
||||
|
||||
) }
|
||||
</ul>
|
||||
);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const mapStateToErrorMessages = (state) => {
|
||||
const { errorMessages, error } = state.userinfo;
|
||||
return { errorMessages, error };
|
||||
};
|
||||
|
||||
const VisibleRegisterErrorList = connect(
|
||||
mapStateToErrorMessages
|
||||
)(RegisterErrorList);
|
||||
|
||||
class RegisterForm extends React.Component {
|
||||
|
||||
constructor(props) {
|
||||
super(props);
|
||||
|
||||
this.state = {
|
||||
username : '',
|
||||
email : '',
|
||||
password : ''
|
||||
};
|
||||
}
|
||||
|
||||
render() {
|
||||
return (
|
||||
<Form>
|
||||
<FormGroup>
|
||||
<Label for="username">Benutzername</Label>
|
||||
<Input name="username"/>
|
||||
<Input name="username" value={this.state.username} onChange={ this.handleUsernameInput.bind(this) } />
|
||||
<FormText>Wenn du anderen dein Turnier zeigst, können sie deinen Benutzernamen sehen.</FormText>
|
||||
</FormGroup>
|
||||
<FormGroup>
|
||||
<Label for="email">E-Mail-Adresse</Label>
|
||||
<Input type="email" name="email"/>
|
||||
<Input type="email" name="email" value={this.state.email} onChange={ this.handleEmailInput.bind(this) } />
|
||||
<FormText>Deine E-Mail-Adresse kann nur von dir gesehen werden.</FormText>
|
||||
</FormGroup>
|
||||
<FormGroup>
|
||||
<Label for="password">Passwort</Label>
|
||||
<Input type="password" name="password"/>
|
||||
<Input type="password" name="password" value={this.state.password} onChange={ this.handlePasswordInput.bind(this) } />
|
||||
<FormText>Dein Passwort muss mindestens 12 Zeichen lang sein. Alle Zeichen sind erlaubt.</FormText>
|
||||
</FormGroup>
|
||||
<FormText className="mb-2 mt-4">
|
||||
Du akzeptierst die <a href="/privacy">Datenschutzbestimmungen</a>, wenn du auf Registrieren klickst.
|
||||
</FormText>
|
||||
<Button color="success" size="lg" className="w-100 shadow-sm">Registrieren</Button>
|
||||
<Button onClick={ register.bind(this, this.state.username, this.state.email, this.state.password) } color="success" size="lg" className="w-100 shadow-sm">Registrieren</Button>
|
||||
<VisibleRegisterErrorList/>
|
||||
</Form>
|
||||
);
|
||||
}
|
||||
|
||||
handlePasswordInput(input) {
|
||||
this.setState({ password : input.target.value });
|
||||
}
|
||||
|
||||
handleEmailInput(input) {
|
||||
this.setState({ email : input.target.value });
|
||||
}
|
||||
|
||||
handleUsernameInput(input) {
|
||||
this.setState({ username : input.target.value });
|
||||
}
|
||||
}
|
||||
|
||||
function AccountRequirementMarketing() {
|
||||
return (
|
||||
<Container>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import Head from 'next/head'
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
|
||||
class FullscreenTournamentPage extends React.Component {
|
||||
|
||||
static async getInitialProps({query}) {
|
||||
return {query}
|
||||
return {query};
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
@ -19,4 +20,4 @@ class FullscreenTournamentPage extends React.Component {
|
|||
}
|
||||
}
|
||||
|
||||
export default FullscreenTournamentPage
|
||||
export default FullscreenTournamentPage;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
import Head from 'next/head'
|
||||
import "../style.css"
|
||||
import Head from 'next/head';
|
||||
import React from 'react';
|
||||
import '../style.css';
|
||||
|
||||
class TournamentPage extends React.Component {
|
||||
|
||||
static async getInitialProps({query}) {
|
||||
return {query}
|
||||
return {query};
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
@ -20,4 +21,4 @@ class TournamentPage extends React.Component {
|
|||
}
|
||||
}
|
||||
|
||||
export default TournamentPage
|
||||
export default TournamentPage;
|
||||
|
|
|
|||
44
server.js
44
server.js
|
|
@ -1,36 +1,34 @@
|
|||
const express = require('express')
|
||||
const next = require('next')
|
||||
const express = require('express');
|
||||
const next = require('next');
|
||||
|
||||
const dev = process.env.NODE_ENV !== 'production'
|
||||
const app = next({ dev })
|
||||
const handle = app.getRequestHandler()
|
||||
const dev = process.env.NODE_ENV !== 'production';
|
||||
const app = next({ dev });
|
||||
const handle = app.getRequestHandler();
|
||||
|
||||
app.prepare()
|
||||
.then(() => {
|
||||
const server = express()
|
||||
const server = express();
|
||||
|
||||
server.get('/t/:code', (req, res) => {
|
||||
const actualPage = '/tournament'
|
||||
const queryParam = { code: req.params.code }
|
||||
app.render(req, res, actualPage, queryParam)
|
||||
})
|
||||
const actualPage = '/tournament';
|
||||
const queryParam = { code: req.params.code };
|
||||
app.render(req, res, actualPage, queryParam);
|
||||
});
|
||||
|
||||
server.get('/t/:code/fullscreen', (req, res) => {
|
||||
const actualPage = '/tournament-fullscreen'
|
||||
const queryParam = { code: req.params.code }
|
||||
app.render(req, res, actualPage, queryParam)
|
||||
})
|
||||
const actualPage = '/tournament-fullscreen';
|
||||
const queryParam = { code: req.params.code };
|
||||
app.render(req, res, actualPage, queryParam);
|
||||
});
|
||||
|
||||
server.get('*', (req, res) => {
|
||||
return handle(req, res)
|
||||
})
|
||||
return handle(req, res);
|
||||
});
|
||||
|
||||
server.listen(3000, (err) => {
|
||||
if (err) throw err
|
||||
console.log('> Ready on http://localhost:3000')
|
||||
})
|
||||
})
|
||||
.catch((ex) => {
|
||||
console.error(ex.stack)
|
||||
process.exit(1)
|
||||
if (err) throw err;
|
||||
});
|
||||
})
|
||||
.catch(() => {
|
||||
process.exit(1);
|
||||
});
|
||||
|
|
|
|||
350
yarn.lock
350
yarn.lock
|
|
@ -1060,11 +1060,21 @@ acorn-dynamic-import@^3.0.0:
|
|||
dependencies:
|
||||
acorn "^5.0.0"
|
||||
|
||||
acorn-jsx@^5.0.0:
|
||||
version "5.0.1"
|
||||
resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
|
||||
integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
|
||||
|
||||
acorn@^5.0.0, acorn@^5.6.2:
|
||||
version "5.7.3"
|
||||
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
|
||||
integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
|
||||
|
||||
acorn@^6.0.2:
|
||||
version "6.0.4"
|
||||
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
|
||||
integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
|
||||
|
||||
ajv-errors@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
|
||||
|
|
@ -1085,6 +1095,16 @@ ajv@^6.0.1, ajv@^6.1.0:
|
|||
json-schema-traverse "^0.4.1"
|
||||
uri-js "^4.2.2"
|
||||
|
||||
ajv@^6.5.3, ajv@^6.6.1:
|
||||
version "6.6.1"
|
||||
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.1.tgz#6360f5ed0d80f232cc2b294c362d5dc2e538dd61"
|
||||
integrity sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==
|
||||
dependencies:
|
||||
fast-deep-equal "^2.0.1"
|
||||
fast-json-stable-stringify "^2.0.0"
|
||||
json-schema-traverse "^0.4.1"
|
||||
uri-js "^4.2.2"
|
||||
|
||||
ansi-colors@^3.0.0:
|
||||
version "3.2.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.1.tgz#9638047e4213f3428a11944a7d4b31cba0a3ff95"
|
||||
|
|
@ -1110,12 +1130,17 @@ ansi-regex@^3.0.0:
|
|||
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
|
||||
integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
|
||||
|
||||
ansi-regex@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
|
||||
integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
|
||||
|
||||
ansi-styles@^2.2.1:
|
||||
version "2.2.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
|
||||
integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
|
||||
|
||||
ansi-styles@^3.2.1:
|
||||
ansi-styles@^3.2.0, ansi-styles@^3.2.1:
|
||||
version "3.2.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
|
||||
integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
|
||||
|
|
@ -1202,6 +1227,14 @@ array-flatten@1.1.1:
|
|||
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
|
||||
integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
|
||||
|
||||
array-includes@^3.0.3:
|
||||
version "3.0.3"
|
||||
resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
|
||||
integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
|
||||
dependencies:
|
||||
define-properties "^1.1.2"
|
||||
es-abstract "^1.7.0"
|
||||
|
||||
array-map@~0.0.0:
|
||||
version "0.0.0"
|
||||
resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
|
||||
|
|
@ -1275,6 +1308,11 @@ ast-types@0.11.5:
|
|||
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.5.tgz#9890825d660c03c28339f315e9fa0a360e31ec28"
|
||||
integrity sha512-oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==
|
||||
|
||||
astral-regex@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
|
||||
integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
|
||||
|
||||
async-each@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
|
||||
|
|
@ -2312,6 +2350,18 @@ call-me-maybe@^1.0.1:
|
|||
resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
|
||||
integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
|
||||
|
||||
caller-path@^0.1.0:
|
||||
version "0.1.0"
|
||||
resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
|
||||
integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
|
||||
dependencies:
|
||||
callsites "^0.2.0"
|
||||
|
||||
callsites@^0.2.0:
|
||||
version "0.2.0"
|
||||
resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
|
||||
integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
|
||||
|
||||
camelcase@^4.1.0:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
|
||||
|
|
@ -2411,6 +2461,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
|
|||
inherits "^2.0.1"
|
||||
safe-buffer "^5.0.1"
|
||||
|
||||
circular-json@^0.3.1:
|
||||
version "0.3.3"
|
||||
resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
|
||||
integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
|
||||
|
||||
class-utils@^0.3.5:
|
||||
version "0.3.6"
|
||||
resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
|
||||
|
|
@ -2815,6 +2870,13 @@ debug@^3.1.0:
|
|||
dependencies:
|
||||
ms "^2.1.1"
|
||||
|
||||
debug@^4.0.1:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
|
||||
integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
|
||||
dependencies:
|
||||
ms "^2.1.1"
|
||||
|
||||
decamelize@^1.1.1:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
|
||||
|
|
@ -2837,6 +2899,11 @@ deep-extend@^0.6.0:
|
|||
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
|
||||
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
|
||||
|
||||
deep-is@~0.1.3:
|
||||
version "0.1.3"
|
||||
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
|
||||
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
|
||||
|
||||
define-properties@^1.1.2:
|
||||
version "1.1.3"
|
||||
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
|
||||
|
|
@ -2958,6 +3025,13 @@ dir-glob@^2.0.0:
|
|||
arrify "^1.0.1"
|
||||
path-type "^3.0.0"
|
||||
|
||||
doctrine@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
|
||||
integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
|
||||
dependencies:
|
||||
esutils "^2.0.2"
|
||||
|
||||
dom-helpers@^3.3.1:
|
||||
version "3.4.0"
|
||||
resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
|
||||
|
|
@ -3103,7 +3177,7 @@ error@^7.0.2:
|
|||
string-template "~0.2.1"
|
||||
xtend "~4.0.0"
|
||||
|
||||
es-abstract@^1.5.1:
|
||||
es-abstract@^1.5.1, es-abstract@^1.7.0:
|
||||
version "1.12.0"
|
||||
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
|
||||
integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
|
||||
|
|
@ -3133,6 +3207,17 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
|
|||
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
|
||||
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
|
||||
|
||||
eslint-plugin-react@^7.11.1:
|
||||
version "7.11.1"
|
||||
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz#c01a7af6f17519457d6116aa94fc6d2ccad5443c"
|
||||
integrity sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==
|
||||
dependencies:
|
||||
array-includes "^3.0.3"
|
||||
doctrine "^2.1.0"
|
||||
has "^1.0.3"
|
||||
jsx-ast-utils "^2.0.1"
|
||||
prop-types "^15.6.2"
|
||||
|
||||
eslint-scope@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
|
||||
|
|
@ -3141,11 +3226,81 @@ eslint-scope@^4.0.0:
|
|||
esrecurse "^4.1.0"
|
||||
estraverse "^4.1.1"
|
||||
|
||||
eslint-utils@^1.3.1:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
|
||||
integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
|
||||
|
||||
eslint-visitor-keys@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
|
||||
integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
|
||||
|
||||
eslint@^5.9.0:
|
||||
version "5.9.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz#b234b6d15ef84b5849c6de2af43195a2d59d408e"
|
||||
integrity sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==
|
||||
dependencies:
|
||||
"@babel/code-frame" "^7.0.0"
|
||||
ajv "^6.5.3"
|
||||
chalk "^2.1.0"
|
||||
cross-spawn "^6.0.5"
|
||||
debug "^4.0.1"
|
||||
doctrine "^2.1.0"
|
||||
eslint-scope "^4.0.0"
|
||||
eslint-utils "^1.3.1"
|
||||
eslint-visitor-keys "^1.0.0"
|
||||
espree "^4.0.0"
|
||||
esquery "^1.0.1"
|
||||
esutils "^2.0.2"
|
||||
file-entry-cache "^2.0.0"
|
||||
functional-red-black-tree "^1.0.1"
|
||||
glob "^7.1.2"
|
||||
globals "^11.7.0"
|
||||
ignore "^4.0.6"
|
||||
imurmurhash "^0.1.4"
|
||||
inquirer "^6.1.0"
|
||||
is-resolvable "^1.1.0"
|
||||
js-yaml "^3.12.0"
|
||||
json-stable-stringify-without-jsonify "^1.0.1"
|
||||
levn "^0.3.0"
|
||||
lodash "^4.17.5"
|
||||
minimatch "^3.0.4"
|
||||
mkdirp "^0.5.1"
|
||||
natural-compare "^1.4.0"
|
||||
optionator "^0.8.2"
|
||||
path-is-inside "^1.0.2"
|
||||
pluralize "^7.0.0"
|
||||
progress "^2.0.0"
|
||||
regexpp "^2.0.1"
|
||||
require-uncached "^1.0.3"
|
||||
semver "^5.5.1"
|
||||
strip-ansi "^4.0.0"
|
||||
strip-json-comments "^2.0.1"
|
||||
table "^5.0.2"
|
||||
text-table "^0.2.0"
|
||||
|
||||
espree@^4.0.0:
|
||||
version "4.1.0"
|
||||
resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f"
|
||||
integrity sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==
|
||||
dependencies:
|
||||
acorn "^6.0.2"
|
||||
acorn-jsx "^5.0.0"
|
||||
eslint-visitor-keys "^1.0.0"
|
||||
|
||||
esprima@^4.0.0, esprima@~4.0.0:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
|
||||
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
|
||||
|
||||
esquery@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
|
||||
integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
|
||||
dependencies:
|
||||
estraverse "^4.0.0"
|
||||
|
||||
esrecurse@^4.1.0:
|
||||
version "4.2.1"
|
||||
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
|
||||
|
|
@ -3153,7 +3308,7 @@ esrecurse@^4.1.0:
|
|||
dependencies:
|
||||
estraverse "^4.1.0"
|
||||
|
||||
estraverse@^4.1.0, estraverse@^4.1.1:
|
||||
estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
|
||||
version "4.2.0"
|
||||
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
|
||||
integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
|
||||
|
|
@ -3350,6 +3505,11 @@ fast-json-stable-stringify@^2.0.0:
|
|||
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
|
||||
integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
|
||||
|
||||
fast-levenshtein@~2.0.4:
|
||||
version "2.0.6"
|
||||
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
|
||||
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
|
||||
|
||||
fastparse@^1.1.1:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
|
||||
|
|
@ -3375,6 +3535,14 @@ figures@^2.0.0:
|
|||
dependencies:
|
||||
escape-string-regexp "^1.0.5"
|
||||
|
||||
file-entry-cache@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
|
||||
integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
|
||||
dependencies:
|
||||
flat-cache "^1.2.1"
|
||||
object-assign "^4.0.1"
|
||||
|
||||
filename-regex@^2.0.0:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
|
||||
|
|
@ -3458,6 +3626,16 @@ first-chunk-stream@^2.0.0:
|
|||
dependencies:
|
||||
readable-stream "^2.0.2"
|
||||
|
||||
flat-cache@^1.2.1:
|
||||
version "1.3.4"
|
||||
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
|
||||
integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
|
||||
dependencies:
|
||||
circular-json "^0.3.1"
|
||||
graceful-fs "^4.1.2"
|
||||
rimraf "~2.6.2"
|
||||
write "^0.2.1"
|
||||
|
||||
flow-parser@^0.*:
|
||||
version "0.87.0"
|
||||
resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.87.0.tgz#a6d0e0b70f2cebdc15febb4eaf149877edbf145d"
|
||||
|
|
@ -3559,6 +3737,11 @@ function-bind@^1.1.1:
|
|||
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
|
||||
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
|
||||
|
||||
functional-red-black-tree@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
|
||||
integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
|
||||
|
||||
gauge@~2.7.3:
|
||||
version "2.7.4"
|
||||
resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
|
||||
|
|
@ -3688,6 +3871,11 @@ globals@^11.1.0:
|
|||
resolved "https://registry.yarnpkg.com/globals/-/globals-11.8.0.tgz#c1ef45ee9bed6badf0663c5cb90e8d1adec1321d"
|
||||
integrity sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==
|
||||
|
||||
globals@^11.7.0:
|
||||
version "11.9.0"
|
||||
resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
|
||||
integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
|
||||
|
||||
globals@^9.18.0:
|
||||
version "9.18.0"
|
||||
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
|
||||
|
|
@ -4028,6 +4216,11 @@ ignore@^3.3.5:
|
|||
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
|
||||
integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
|
||||
|
||||
ignore@^4.0.6:
|
||||
version "4.0.6"
|
||||
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
|
||||
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
|
||||
|
||||
import-cwd@^2.0.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
|
||||
|
|
@ -4126,6 +4319,25 @@ inquirer@^6.0.0:
|
|||
strip-ansi "^4.0.0"
|
||||
through "^2.3.6"
|
||||
|
||||
inquirer@^6.1.0:
|
||||
version "6.2.1"
|
||||
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
|
||||
integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
|
||||
dependencies:
|
||||
ansi-escapes "^3.0.0"
|
||||
chalk "^2.0.0"
|
||||
cli-cursor "^2.1.0"
|
||||
cli-width "^2.0.0"
|
||||
external-editor "^3.0.0"
|
||||
figures "^2.0.0"
|
||||
lodash "^4.17.10"
|
||||
mute-stream "0.0.7"
|
||||
run-async "^2.2.0"
|
||||
rxjs "^6.1.0"
|
||||
string-width "^2.1.0"
|
||||
strip-ansi "^5.0.0"
|
||||
through "^2.3.6"
|
||||
|
||||
interpret@^1.0.0, interpret@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
|
||||
|
|
@ -4406,6 +4618,11 @@ is-regex@^1.0.4:
|
|||
dependencies:
|
||||
has "^1.0.1"
|
||||
|
||||
is-resolvable@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
|
||||
integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
|
||||
|
||||
is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
|
||||
|
|
@ -4501,7 +4718,7 @@ js-tokens@^3.0.2:
|
|||
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
|
||||
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
|
||||
|
||||
js-yaml@^3.9.0:
|
||||
js-yaml@^3.12.0, js-yaml@^3.9.0:
|
||||
version "3.12.0"
|
||||
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
|
||||
integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
|
||||
|
|
@ -4581,6 +4798,11 @@ json-schema-traverse@^0.4.1:
|
|||
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
|
||||
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
|
||||
|
||||
json-stable-stringify-without-jsonify@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
|
||||
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
|
||||
|
||||
json5@^0.5.0, json5@^0.5.1:
|
||||
version "0.5.1"
|
||||
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
|
||||
|
|
@ -4591,6 +4813,13 @@ jsonify@~0.0.0:
|
|||
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
|
||||
integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
|
||||
|
||||
jsx-ast-utils@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
|
||||
integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
|
||||
dependencies:
|
||||
array-includes "^3.0.3"
|
||||
|
||||
junk@^1.0.1:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/junk/-/junk-1.0.3.tgz#87be63488649cbdca6f53ab39bec9ccd2347f592"
|
||||
|
|
@ -4642,6 +4871,14 @@ lcid@^1.0.0:
|
|||
dependencies:
|
||||
invert-kv "^1.0.0"
|
||||
|
||||
levn@^0.3.0, levn@~0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
|
||||
integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
|
||||
dependencies:
|
||||
prelude-ls "~1.1.2"
|
||||
type-check "~0.3.2"
|
||||
|
||||
listr-silent-renderer@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
|
||||
|
|
@ -4761,7 +4998,7 @@ lodash.tonumber@^4.0.3:
|
|||
resolved "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz#0b96b31b35672793eb7f5a63ee791f1b9e9025d9"
|
||||
integrity sha1-C5azGzVnJ5Prf1pj7nkfG56QJdk=
|
||||
|
||||
lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
|
||||
lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
|
||||
version "4.17.11"
|
||||
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
|
||||
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
|
||||
|
|
@ -5176,6 +5413,11 @@ nanomatch@^1.2.9:
|
|||
snapdragon "^0.8.1"
|
||||
to-regex "^3.0.1"
|
||||
|
||||
natural-compare@^1.4.0:
|
||||
version "1.4.0"
|
||||
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
|
||||
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
|
||||
|
||||
needle@^2.2.1:
|
||||
version "2.2.4"
|
||||
resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
|
||||
|
|
@ -5473,6 +5715,18 @@ onetime@^2.0.0:
|
|||
dependencies:
|
||||
mimic-fn "^1.0.0"
|
||||
|
||||
optionator@^0.8.2:
|
||||
version "0.8.2"
|
||||
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
|
||||
integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
|
||||
dependencies:
|
||||
deep-is "~0.1.3"
|
||||
fast-levenshtein "~2.0.4"
|
||||
levn "~0.3.0"
|
||||
prelude-ls "~1.1.2"
|
||||
type-check "~0.3.2"
|
||||
wordwrap "~1.0.0"
|
||||
|
||||
os-browserify@^0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
|
||||
|
|
@ -5689,7 +5943,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
|
|||
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
|
||||
integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
|
||||
|
||||
path-is-inside@^1.0.1:
|
||||
path-is-inside@^1.0.1, path-is-inside@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
|
||||
integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
|
||||
|
|
@ -5775,6 +6029,11 @@ pkg-dir@^3.0.0:
|
|||
dependencies:
|
||||
find-up "^3.0.0"
|
||||
|
||||
pluralize@^7.0.0:
|
||||
version "7.0.0"
|
||||
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
|
||||
integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
|
||||
|
||||
popper.js@^1.14.1:
|
||||
version "1.14.4"
|
||||
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.4.tgz#8eec1d8ff02a5a3a152dd43414a15c7b79fd69b6"
|
||||
|
|
@ -5857,6 +6116,11 @@ postcss@^7.0.0:
|
|||
source-map "^0.6.1"
|
||||
supports-color "^5.5.0"
|
||||
|
||||
prelude-ls@~1.1.2:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
|
||||
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
|
||||
|
||||
prepend-http@^1.0.1:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
|
||||
|
|
@ -5902,6 +6166,11 @@ process@^0.11.10:
|
|||
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
|
||||
integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
|
||||
|
||||
progress@^2.0.0:
|
||||
version "2.0.3"
|
||||
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
|
||||
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
|
||||
|
||||
promise-inflight@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
|
||||
|
|
@ -6360,6 +6629,11 @@ regex-not@^1.0.0, regex-not@^1.0.2:
|
|||
extend-shallow "^3.0.2"
|
||||
safe-regex "^1.1.0"
|
||||
|
||||
regexpp@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
|
||||
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
|
||||
|
||||
regexpu-core@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
|
||||
|
|
@ -6461,6 +6735,14 @@ require-main-filename@^1.0.1:
|
|||
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
|
||||
integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
|
||||
|
||||
require-uncached@^1.0.3:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
|
||||
integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
|
||||
dependencies:
|
||||
caller-path "^0.1.0"
|
||||
resolve-from "^1.0.0"
|
||||
|
||||
resolve-cwd@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
|
||||
|
|
@ -6476,6 +6758,11 @@ resolve-dir@^1.0.0:
|
|||
expand-tilde "^2.0.0"
|
||||
global-modules "^1.0.0"
|
||||
|
||||
resolve-from@^1.0.0:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
|
||||
integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
|
||||
|
||||
resolve-from@^3.0.0:
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
|
||||
|
|
@ -6520,7 +6807,7 @@ ret@~0.1.10:
|
|||
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
|
||||
integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
|
||||
|
||||
rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
|
||||
rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
|
||||
version "2.6.2"
|
||||
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
|
||||
integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
|
||||
|
|
@ -6628,7 +6915,7 @@ scoped-regex@^1.0.0:
|
|||
resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
|
||||
integrity sha1-o0a7Gs1CB65wvXwMfKnlZra63bg=
|
||||
|
||||
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
|
||||
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
|
||||
version "5.6.0"
|
||||
resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
|
||||
integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
|
||||
|
|
@ -6787,6 +7074,15 @@ slice-ansi@1.0.0:
|
|||
dependencies:
|
||||
is-fullwidth-code-point "^2.0.0"
|
||||
|
||||
slice-ansi@2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7"
|
||||
integrity sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==
|
||||
dependencies:
|
||||
ansi-styles "^3.2.0"
|
||||
astral-regex "^1.0.0"
|
||||
is-fullwidth-code-point "^2.0.0"
|
||||
|
||||
slide@^1.1.5:
|
||||
version "1.1.6"
|
||||
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
|
||||
|
|
@ -7052,6 +7348,13 @@ strip-ansi@^4.0.0:
|
|||
dependencies:
|
||||
ansi-regex "^3.0.0"
|
||||
|
||||
strip-ansi@^5.0.0:
|
||||
version "5.0.0"
|
||||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
|
||||
integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
|
||||
dependencies:
|
||||
ansi-regex "^4.0.0"
|
||||
|
||||
strip-ansi@~0.1.0:
|
||||
version "0.1.1"
|
||||
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
|
||||
|
|
@ -7082,7 +7385,7 @@ strip-eof@^1.0.0:
|
|||
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
|
||||
integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
|
||||
|
||||
strip-json-comments@~2.0.1:
|
||||
strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
|
||||
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
|
||||
|
|
@ -7145,6 +7448,16 @@ table@^4.0.3:
|
|||
slice-ansi "1.0.0"
|
||||
string-width "^2.1.1"
|
||||
|
||||
table@^5.0.2:
|
||||
version "5.1.1"
|
||||
resolved "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz#92030192f1b7b51b6eeab23ed416862e47b70837"
|
||||
integrity sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==
|
||||
dependencies:
|
||||
ajv "^6.6.1"
|
||||
lodash "^4.17.11"
|
||||
slice-ansi "2.0.0"
|
||||
string-width "^2.1.1"
|
||||
|
||||
tapable@^1.0.0, tapable@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
|
||||
|
|
@ -7305,6 +7618,13 @@ tty-browserify@0.0.0:
|
|||
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
|
||||
integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
|
||||
|
||||
type-check@~0.3.2:
|
||||
version "0.3.2"
|
||||
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
|
||||
integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
|
||||
dependencies:
|
||||
prelude-ls "~1.1.2"
|
||||
|
||||
type-is@~1.6.16:
|
||||
version "1.6.16"
|
||||
resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
|
||||
|
|
@ -7753,6 +8073,11 @@ wide-align@^1.1.0:
|
|||
dependencies:
|
||||
string-width "^1.0.2 || 2"
|
||||
|
||||
wordwrap@~1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
|
||||
integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
|
||||
|
||||
worker-farm@^1.5.2:
|
||||
version "1.6.0"
|
||||
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
|
||||
|
|
@ -7802,6 +8127,13 @@ write-file-webpack-plugin@4.3.2:
|
|||
mkdirp "^0.5.1"
|
||||
moment "^2.22.1"
|
||||
|
||||
write@^0.2.1:
|
||||
version "0.2.1"
|
||||
resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
|
||||
integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
|
||||
dependencies:
|
||||
mkdirp "^0.5.1"
|
||||
|
||||
xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
|
||||
version "4.0.1"
|
||||
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
|
||||
|
|
|
|||
Loading…
Reference in New Issue