Merge branch 'master' into server

This commit is contained in:
2023-05-06 09:01:32 +02:00
19 changed files with 60 additions and 10 deletions
+1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta content="Tone API" property="og:title"/><meta content="Northstar kill statistics" property="og:description"/><meta content="https://toneapi.github.io/ToneAPI_webclient/" property="og:url"/><meta content="https://toneapi.github.io/ToneAPI_webclient/og_image.png" property="og:image"/><meta name="twitter:card" content="summary_large_image"><link rel="icon" href="/ToneAPI_webclient/favicon.ico"><title>toneapi_webclient</title><script defer="defer" src="/ToneAPI_webclient/js/chunk-vendors.3d141dfa.js"></script><script defer="defer" src="/ToneAPI_webclient/js/app.04e88cb3.js"></script><link href="/ToneAPI_webclient/css/app.2d4ee00d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but toneapi_webclient doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta content="Tone API" property="og:title"/><meta content="Northstar kill statistics" property="og:description"/><meta content="https://toneapi.github.io/ToneAPI_webclient/" property="og:url"/><meta content="https://toneapi.github.io/ToneAPI_webclient/og_image.png" property="og:image"/><meta name="twitter:card" content="summary_large_image"><link rel="icon" href="/ToneAPI_webclient/favicon.ico"><title>Players : Tone API</title><script defer="defer" src="/ToneAPI_webclient/js/chunk-vendors.3d141dfa.js"></script><script defer="defer" src="/ToneAPI_webclient/js/chunk-common.f81b38e5.js"></script><script defer="defer" src="/ToneAPI_webclient/js/index.e9ec2819.js"></script><link href="/ToneAPI_webclient/css/index.2d4ee00d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Players : Tone API doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
-2
View File
File diff suppressed because one or more lines are too long
-1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
View File
@@ -0,0 +1,2 @@
(function(){"use strict";var n={},t={};function r(e){var o=t[e];if(void 0!==o)return o.exports;var i=t[e]={exports:{}};return n[e](i,i.exports,r),i.exports}r.m=n,function(){var n=[];r.O=function(t,e,o,i){if(!e){var u=1/0;for(l=0;l<n.length;l++){e=n[l][0],o=n[l][1],i=n[l][2];for(var f=!0,c=0;c<e.length;c++)(!1&i||u>=i)&&Object.keys(r.O).every((function(n){return r.O[n](e[c])}))?e.splice(c--,1):(f=!1,i<u&&(u=i));if(f){n.splice(l--,1);var a=o();void 0!==a&&(t=a)}}return t}i=i||0;for(var l=n.length;l>0&&n[l-1][2]>i;l--)n[l]=n[l-1];n[l]=[e,o,i]}}(),function(){r.n=function(n){var t=n&&n.__esModule?function(){return n["default"]}:function(){return n};return r.d(t,{a:t}),t}}(),function(){r.d=function(n,t){for(var e in t)r.o(t,e)&&!r.o(n,e)&&Object.defineProperty(n,e,{enumerable:!0,get:t[e]})}}(),function(){r.g=function(){if("object"===typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(n){if("object"===typeof window)return window}}()}(),function(){r.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)}}(),function(){var n={826:0,377:0};r.O.j=function(t){return 0===n[t]};var t=function(t,e){var o,i,u=e[0],f=e[1],c=e[2],a=0;if(u.some((function(t){return 0!==n[t]}))){for(o in f)r.o(f,o)&&(r.m[o]=f[o]);if(c)var l=c(r)}for(t&&t(e);a<u.length;a++)i=u[a],r.o(n,i)&&n[i]&&n[i][0](),n[i]=0;return r.O(l)},e=self["webpackChunktoneapi_webclient"]=self["webpackChunktoneapi_webclient"]||[];e.forEach(t.bind(null,0)),e.push=t.bind(null,e.push.bind(e))}();var e=r.O(void 0,[998,64],(function(){return r(5246)}));e=r.O(e)})();
//# sourceMappingURL=index.e9ec2819.js.map
+1
View File
File diff suppressed because one or more lines are too long
+2
View File
@@ -0,0 +1,2 @@
(function(){"use strict";var n={},t={};function r(e){var o=t[e];if(void 0!==o)return o.exports;var i=t[e]={exports:{}};return n[e](i,i.exports,r),i.exports}r.m=n,function(){var n=[];r.O=function(t,e,o,i){if(!e){var u=1/0;for(l=0;l<n.length;l++){e=n[l][0],o=n[l][1],i=n[l][2];for(var f=!0,c=0;c<e.length;c++)(!1&i||u>=i)&&Object.keys(r.O).every((function(n){return r.O[n](e[c])}))?e.splice(c--,1):(f=!1,i<u&&(u=i));if(f){n.splice(l--,1);var a=o();void 0!==a&&(t=a)}}return t}i=i||0;for(var l=n.length;l>0&&n[l-1][2]>i;l--)n[l]=n[l-1];n[l]=[e,o,i]}}(),function(){r.n=function(n){var t=n&&n.__esModule?function(){return n["default"]}:function(){return n};return r.d(t,{a:t}),t}}(),function(){r.d=function(n,t){for(var e in t)r.o(t,e)&&!r.o(n,e)&&Object.defineProperty(n,e,{enumerable:!0,get:t[e]})}}(),function(){r.g=function(){if("object"===typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(n){if("object"===typeof window)return window}}()}(),function(){r.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)}}(),function(){var n={377:0,826:0};r.O.j=function(t){return 0===n[t]};var t=function(t,e){var o,i,u=e[0],f=e[1],c=e[2],a=0;if(u.some((function(t){return 0!==n[t]}))){for(o in f)r.o(f,o)&&(r.m[o]=f[o]);if(c)var l=c(r)}for(t&&t(e);a<u.length;a++)i=u[a],r.o(n,i)&&n[i]&&n[i][0](),n[i]=0;return r.O(l)},e=self["webpackChunktoneapi_webclient"]=self["webpackChunktoneapi_webclient"]||[];e.forEach(t.bind(null,0)),e.push=t.bind(null,e.push.bind(e))}();var e=r.O(void 0,[998,64],(function(){return r(5246)}));e=r.O(e)})();
//# sourceMappingURL=server.a6948ab9.js.map
File diff suppressed because one or more lines are too long
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 442 KiB

+1
View File
@@ -0,0 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><meta content="Tone API" property="og:title"/><meta content="Northstar servers kills statistics" property="og:description"/><meta content="https://toneapi.github.io/ToneAPI_webclient/servers" property="og:url"/><meta content="https://toneapi.github.io/ToneAPI_webclient/server_og_image.png" property="og:image"/><meta name="twitter:card" content="summary_large_image"><link rel="icon" href="/ToneAPI_webclient/favicon.ico"><title>Servers : Tone API</title><script defer="defer" src="/ToneAPI_webclient/js/chunk-vendors.3d141dfa.js"></script><script defer="defer" src="/ToneAPI_webclient/js/chunk-common.f81b38e5.js"></script><script defer="defer" src="/ToneAPI_webclient/js/server.a6948ab9.js"></script><link href="/ToneAPI_webclient/css/server.2d4ee00d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Servers : Tone API doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+3 -3
View File
@@ -4,11 +4,11 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta content="Tone API" property="og:title" />
<meta content="Northstar kill statistics" property="og:description" />
<meta content="Players : Tone API" property="og:title" />
<meta content="Northstar players kills statistics" property="og:description" />
<meta content="https://toneapi.github.io/ToneAPI_webclient/" property="og:url" />
<meta content="https://toneapi.github.io/ToneAPI_webclient/og_image.png" property="og:image" />
<meta name="twitter:card" content="summary_large_image">
<meta name="twitter:card" content="summary_large_image">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
Binary file not shown.

After

Width:  |  Height:  |  Size: 442 KiB

+22
View File
@@ -0,0 +1,22 @@
<!DOCTYPE html>
<html lang="">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta content="Servers : Tone API" property="og:title" />
<meta content="Northstar servers kills statistics" property="og:description" />
<meta content="https://toneapi.github.io/ToneAPI_webclient/servers" property="og:url" />
<meta content="https://toneapi.github.io/ToneAPI_webclient/server_og_image.png" property="og:image" />
<meta name="twitter:card" content="summary_large_image">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<noscript>
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>
+6 -2
View File
@@ -3,7 +3,7 @@
<nav>
<!-- <div class="navbar-element">hamburger</div> -->
<div class="navbar-logo"><a href="https://github.com/Legonzaur/Tone_WebClient" target="_blank"><img src="/tone_icon.png"/></a></div>
<div class="navbar-logo"><a href="https://github.com/Legonzaur/Tone_WebClient" target="_blank"><img :src="`${publicPath}tone_icon.png`"/></a></div>
<div class="navbar-element github-link"><a href="https://github.com/Legonzaur/Tone_WebClient" target="_blank">Github</a></div>
<div class="navbar-element github-link"><a
href="https://github.com/Legonzaur/ToneAPI_servermod" target="_blank">Northstar&nbsp;Server&nbsp;Mod</a></div>
@@ -22,7 +22,11 @@
import { defineComponent } from 'vue'
export default defineComponent({
data () {
return {
publicPath: process.env.BASE_URL
}
}
})
</script>
+2
View File
@@ -102,6 +102,8 @@ function registerWebSocketKill (data : websocketData) {
})
store.$state.weapons.filter((e) => {
return (
(!e.value.filter.server ||
e.value.filter.server === data.servername) &&
(!e.value.filter.player || e.value.filter.player === data.attacker_id)
// Handle other types of filters once those are implemented
)
+15 -1
View File
@@ -1,5 +1,19 @@
const { defineConfig } = require('@vue/cli-service')
module.exports = defineConfig({
transpileDependencies: true,
publicPath: process.env.NODE_ENV === 'production' ? '/ToneAPI_webclient/' : '/'
publicPath: process.env.NODE_ENV === 'production' ? '/ToneAPI_webclient/' : '/',
pages: {
index: {
entry: 'src/main.ts',
template: 'public/index.html',
filename: 'index.html',
title: 'Players : Tone API'
},
server: {
entry: 'src/main.ts',
template: 'public/servers.html',
filename: 'servers.html',
title: 'Servers : Tone API'
}
}
})