-
-
- About
-
-
-
- )
- }
-}
-
-const mapStateToProps = state => {
- return {
- content: state.cms.contents.about
- }
-}
-
-export default connect(mapStateToProps)(About)
diff --git a/src/components/ChromeRivals/OnlineCountChart.js b/src/components/ChromeRivals/OnlineCountChart.js
index b345811..edefa4a 100644
--- a/src/components/ChromeRivals/OnlineCountChart.js
+++ b/src/components/ChromeRivals/OnlineCountChart.js
@@ -3,10 +3,10 @@ import { callApiChecked } from '../../middleware/api'
import config from '../../config'
import { seriesColorCoding } from '../../utils/colors'
import AsyncLineChart from '../AsyncLineChart'
-import isBefore from 'date-fns/is_before'
-import subDays from 'date-fns/sub_days'
-import startOfHour from 'date-fns/start_of_hour'
-import startOfday from 'date-fns/start_of_day'
+import isBefore from 'date-fns/isBefore'
+import subDays from 'date-fns/subDays'
+import startOfHour from 'date-fns/startOfHour'
+import startOfday from 'date-fns/startOfDay'
const options = (scale = 'day') => {
return {
diff --git a/src/components/Contact.js b/src/components/Contact.js
deleted file mode 100644
index 6b681df..0000000
--- a/src/components/Contact.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import React, { Component } from 'react'
-import { Helmet } from 'react-helmet'
-
-import tobiasImg from '../img/techguy_t.jpg'
-
-const SrcLinkFE = () => {
- return (
-
- Frontend
-
- )
-}
-
-const SrcLinkBE = () => {
- return (
-
- API-Backend
-
- )
-}
-
-const TS3Ref = () => {
- return (
-
- Address:{' '}
-
- vi0lation.de
-
-
- )
-}
-
-class Contact extends Component {
- shouldComponentUpdate() {
- return false
- }
-
- render() {
- return (
-
-
-
- Contact
-
-
-
-
-
-
-
-
-
-
-
- )
- }
-}
-
-export default Contact
-export { SrcLinkFE, SrcLinkBE, TS3Ref }
diff --git a/src/components/Footer.js b/src/components/Footer.js
index 4893e9c..ba30dfc 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -1,5 +1,4 @@
import React, { Component } from 'react'
-import Link from 'react-router-dom/Link'
class Footer extends Component {
shouldComponentUpdate() {
@@ -10,24 +9,7 @@ class Footer extends Component {
return (
)
diff --git a/src/components/Home.js b/src/components/Home.js
index 4a25e12..d55dc89 100644
--- a/src/components/Home.js
+++ b/src/components/Home.js
@@ -1,5 +1,6 @@
import React, { Component } from 'react'
import Link from 'react-router-dom/Link'
+import { crTopKillsIntervalUrl } from '../routes'
class Home extends Component {
shouldComponentUpdate() {
@@ -9,41 +10,49 @@ class Home extends Component {
render() {
return (
Contact
- -Tech guy
- -
-
-
-
-
-
-
-
- 
-
-
-
-
- Tobias
-- - IGN - : DrDelay -
-
-
- - Discord: DrDelay#1337 -
-- - 📧 - {' '} - - info@vi0lation.de - {' '} - ( - PGP - ) -
-TeamSpeak
-
-
Site Source-Code
--
-
-
-
-
- -
-
-
-
-
)
diff --git a/src/components/LoadSpinner.css b/src/components/LoadSpinner.css
index 40bf90f..221d783 100644
--- a/src/components/LoadSpinner.css
+++ b/src/components/LoadSpinner.css
@@ -10,8 +10,8 @@
height: 46px;
margin: 1px;
border-radius: 50%;
- border: 5px solid #df691a;
- border-color: #df691a transparent #df691a transparent;
+ border: 5px solid #006488;
+ border-color: #006488 transparent #006488 transparent;
animation: lds-dual-ring 1.2s linear infinite;
}
@keyframes lds-dual-ring {
diff --git a/src/components/Navi.js b/src/components/Navi.js
index c97f292..2e07c86 100644
--- a/src/components/Navi.js
+++ b/src/components/Navi.js
@@ -2,17 +2,8 @@ import React, { Component } from 'react'
import withRouter from 'react-router/withRouter'
import NavLink from './NavLink'
-import classNames from 'classnames'
-
-import { highscoresUrl, crTopKillsIntervalUrl } from '../routes'
-
-const NavTab = props => {
- return (
- Vi0
+ChromeRivals Tools
-
+
-
-
AirRivals/AceOnline
-Tools & Stats
+Fame Ranking
+Date comparison
-
+
-
-
TeamSpeak 3
-Listing of the TS3 Servers
+Playercount
+Online history
-
+
+
-
TERA
-Gameplay / services / stats
+WeaponCalc
+Item/gear stats
- {props.children}
-
- )
-}
+import { crTopKillsIntervalUrl } from '../routes'
+import { resetCurrentInstance as resetCurrentWeapCalcInstance } from './AR/WeaponCalc/index'
const responsiveExpandedClass = 'is-active'
const mainNav = 'mainNav'
@@ -45,7 +36,7 @@ class Navi extends Component {
-
-
- AR/AO
-
-
-
-
- TeamSpeak 3
-
-
-
-
- TERA
-
-
+
+ Ranking
+
+
+ Fame-Chart
+
+
+ Playercount
+
+ resetCurrentWeapCalcInstance()}
+ >
+ WeaponCalc
+
+
+ Events
+
- FrameBreak Tool
- StatCalc
- EP List
- Prokyon/DE Highscores
-
- ChromeRivals Ranking
-
-
- ChromeRivals Fame chart
-
-
- ChromeRivals Online-players
-
-
-
+ Not supported: Your browser doesn't provide all the
+ features required to use push notifications.
+
+ Error: {errorMessage}
+
+
+
+
+ )
+ }
+
+ changePushSubscriptionButton() {
+ if (this.state.isPushEnabled) {
+ this.push_unsubscribe()
+ } else {
+ push_subscribe(this.changePushButtonState.bind(this))
+ }
+ }
+
+ changePushButtonState(state, body) {
+ switch (state) {
+ case 'enabled':
+ this.setState({
+ buttonDisabled: false,
+ buttonContent: 'Disable Notifications',
+ isPushEnabled: true,
+ pushSubCredBody: body
+ })
+ break
+ case 'disabled':
+ this.setState({
+ buttonDisabled: false,
+ buttonContent: 'Enable Notifications',
+ isPushEnabled: false
+ })
+ break
+ case 'computing':
+ this.setState({ buttonDisabled: true, buttonContent: 'Please wait' })
+ break
+ case 'incompatible':
+ this.setState({
+ buttonDisabled: true,
+ buttonContent:
+ 'Push notifications are not compatible with this browser'
+ })
+ break
+ default:
+ console.error('Unhandled push button state', state)
+ break
+ }
+ }
+
+ push_unsubscribe() {
+ this.changePushButtonState('computing')
+
+ // To unsubscribe from push messaging, you need to get the subscription object
+ navigator.serviceWorker.ready
+ .then(serviceWorkerRegistration =>
+ serviceWorkerRegistration.pushManager.getSubscription()
+ )
+ .then(subscription => {
+ // Check that we have a subscription to unsubscribe
+ if (!subscription) {
+ // No subscription object, so set the state
+ // to allow the user to subscribe to push
+ this.changePushButtonState('disabled')
+ return
+ }
+
+ // We have a subscription, unsubscribe
+ // Remove push subscription from server
+ let body = generateSubscriptionBody(subscription)
+
+ return sendPushToServer('DELETE', body).then(() => subscription)
+ })
+ .then(subscription => subscription.unsubscribe())
+ .then(() => this.changePushButtonState('disabled'))
+ .catch(e => {
+ // We failed to unsubscribe, this can lead to
+ // an unusual state, so it may be best to remove
+ // the users data from your data store and
+ // inform the user that you have done so
+ console.error('Error when unsubscribing the user', e)
+ this.changePushButtonState('disabled')
+ })
+ }
+}
+
+const mapStateToProps = state => {
+ return {
+ subEvents: state.push.events
+ }
+}
+
+export default connect(mapStateToProps)(PushSub)
diff --git a/src/components/TERA.js b/src/components/TERA.js
deleted file mode 100644
index 1b518a3..0000000
--- a/src/components/TERA.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React, { Component } from 'react'
-import { Helmet } from 'react-helmet'
-
-class TERA extends Component {
- shouldComponentUpdate() {
- return false
- }
-
- render() {
- return (
- +
+ {isPushEnabled ? (
+
+
+ {POSSIBLE_EVENTS.map(eventDef => {
+ const isActive =
+ this.props.subEvents.indexOf(eventDef.key) !== -1
+ return (
+ {
+ let newEvents = [...this.props.subEvents]
+ if (isActive) {
+ newEvents.splice(newEvents.indexOf(eventDef.key), 1)
+ } else {
+ newEvents.push(eventDef.key)
+ }
+ this.props.dispatch({
+ type: 'SET_EVENTS',
+ events: newEvents
+ })
+ sendPushToServer('PUT', this.state.pushSubCredBody)
+ }}
+ >
+ {eventDef.name}
+
+ )
+ })}
+
+ ) : null}
+
-
-
- TERA
-
-
-
-
-
- )
- }
-}
-
-export default TERA
diff --git a/src/components/TS3List.js b/src/components/TS3List.js
deleted file mode 100644
index 7d5a3f3..0000000
--- a/src/components/TS3List.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { Component } from 'react'
-import { Helmet } from 'react-helmet'
-
-const TSRef = props => {
- let { url, port } = props.server
-
- return (
- TERA
- -DPS Meter Server
- An instance of{' '} - - tera-dpsmeter-server - {' '} - is deployed at{' '} - tera-dps.vi0lation.de. -
-
-
- TeamSpeak 3 Server
-
-
-
- )
- }
-}
-
-export default TS3List
diff --git a/src/components/TS404Server.js b/src/components/TS404Server.js
deleted file mode 100644
index a381ed2..0000000
--- a/src/components/TS404Server.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React, { Component } from 'react'
-import { Helmet } from 'react-helmet'
-import Link from 'react-router-dom/Link'
-
-class TS404Server extends Component {
- shouldComponentUpdate() {
- return false
- }
-
- render() {
- return (
- TeamSpeak 3 Server
- --
- {this.constructor.tsServers.map(server => (
-
-
-
- TS3 404-Server
-
-
-
- )
- }
-}
-
-export default TS404Server
diff --git a/src/config.js b/src/config.js
index 699fe7b..09f5eeb 100644
--- a/src/config.js
+++ b/src/config.js
@@ -1,5 +1,6 @@
const config = {
- apibase: 'https://api.vi0lation.de/api/'
+ apibase: 'https://api.vi0lation.de/api/',
+ crapibase: 'https://cr-api.vi0.de/q/'
}
export default config
diff --git a/src/containers/AR/Highscores.js b/src/containers/AR/Highscores.js
deleted file mode 100644
index 629ab2f..0000000
--- a/src/containers/AR/Highscores.js
+++ /dev/null
@@ -1,223 +0,0 @@
-import React, { Component } from 'react'
-import { Helmet } from 'react-helmet'
-import { connect } from 'react-redux'
-import PropTypes from 'prop-types'
-import Flatpickr from 'react-flatpickr'
-import 'flatpickr/dist/themes/material_blue.css'
-import dateformat from 'date-fns/format'
-import NumTD from '../../components/AR/NumTD'
-import { minDate, maxDate } from '../../data/dataset'
-import { calcProgessBarByEp } from '../../utils/AR/ep'
-import { fetchHighscoreIfNeeded } from '../../actions/highscores'
-import { highscoresUrl } from '../../routes'
-import withRouter from 'react-router/withRouter'
-import { isNode } from '../../utils/env'
-
-const region = 'de'
-
-class Ranking extends Component {
- // TODO: shouldUpdate
-
- bootstrap() {
- if (isNode) {
- return this.queryCurrentDate()
- }
- }
-
- componentDidMount() {
- this.queryCurrentDate()
- }
-
- componentDidUpdate(prevProps) {
- if (this.props.date !== prevProps.date) {
- this.queryCurrentDate()
- }
- }
-
- queryCurrentDate() {
- const { dispatch, date } = this.props
- return this.constructor.queryForDate(dispatch, date)
- }
-
- static queryForDate(dispatch, date) {
- let hsPromise = dispatch(fetchHighscoreIfNeeded(region, date))
-
- return hsPromise
- }
-
- dateSelected(v) {
- let dateSelected = dateformat(v[0], 'YYYY-MM-DD')
- const { date, history } = this.props
-
- if (date === dateSelected) {
- return
- }
-
- history.push(highscoresUrl + '/' + dateSelected)
- }
-
- tableInfo() {
- return (
- TS3 404-Server
- -- Getting routed to the 404-Server instead of your intended destination - can generally mean two things: -
--
-
- - There was a temporary with the TSDNS service. Trying to connect - again a bit later will most likely work. - -
- - You entered an address that is not or no longer mapped to a server - -
- Refer to the list of available TS3 Servers. -
-
-
-
- {`AirRivals.de ${date} Player Highscores`}
-
-
-
- )
- }
-
- renderTable(data) {
- return (
- AirRivals.de Highscores
-{date}
- - {this.renderForm()} - - {is404 ? ( -
- No data available for the selected date
-
- ) : (
- this.renderTable(data)
- )}
-
-
- {this.tableInfo()}
-
- {data &&
- data.map(function(row, idx) {
- return (
-
-
- )
- }
-}
-
-Ranking.propTypes = {
- // TODO
-}
-
-Ranking.contextTypes = {
- router: PropTypes.shape({
- staticContext: PropTypes.object
- }).isRequired
-}
-
-const mapStateToProps = (state, ownProps) => {
- const regionData = state.highscores[region]
- const { date } = ownProps.match.params
-
- let data = null
- if (regionData) {
- const dateData = regionData[date]
- if (dateData) {
- data = dateData.data
- }
- }
-
- return {
- date,
- data
- }
-}
-
-export default withRouter(connect(mapStateToProps)(Ranking))
diff --git a/src/containers/App.js b/src/containers/App.js
index b0f3cca..8499a31 100644
--- a/src/containers/App.js
+++ b/src/containers/App.js
@@ -8,34 +8,31 @@ import routes from '../routes'
import Navi from '../components/Navi'
import Footer from '../components/Footer'
-import { isNode } from '../utils/env'
-
-import { fetchCmsIfNeeded } from '../actions/cms'
+import { isBrowser, isNode } from '../utils/env'
+import { canUsePush, push_updateSubscription } from '../utils/pushUtils'
const defaultMeta = () => {
return (
- | {idx + 1} | -{row.name} | -{row.gear} | -{calcProgessBarByEp(row.data.ep, row.data.level)} | -{row.brigade} | -{row.nation} | -
|---|
@@ -39,17 +43,27 @@ const StatTag = props => (
{props.label}
- {props.val.toLocaleString()}
+ {props.val !== '' ? props.val.toLocaleString() : ''}
)
class KillsInInterval extends Component {
- // TODO: shouldUpdate/Perf
-
constructor(props) {
super(props)
- this.state = { result: null }
+
+ let nowServerTimeDate = utcToZonedTime(
+ zonedTimeToUtc(new Date(), browserTimeZone),
+ serverTimeZone
+ )
+
+ this.state = {
+ result: null,
+ resultNation: null,
+ resultGearDeaths: null,
+ nowServerTime: nowServerTimeDate,
+ nowInServerTimezone: dateformat(nowServerTimeDate, dateTimeLocalFormat)
+ }
this.TableInfo = (