Compare commits
14 Commits
Author | SHA1 | Date | |
---|---|---|---|
408ee9df1e | |||
36fbe8a685 | |||
110586942d | |||
515de7f747 | |||
2a541196a4 | |||
78da0877c7 | |||
0739d3bf7b | |||
5279267c8e | |||
b3dc4c3d73 | |||
f65fc0a0ea | |||
befc14d894 | |||
e33614862e | |||
3ca1dfe310 | |||
2b188b089c |
@@ -8,7 +8,7 @@ module.exports = {
|
|||||||
'eslint:recommended'
|
'eslint:recommended'
|
||||||
],
|
],
|
||||||
parserOptions: {
|
parserOptions: {
|
||||||
parser: 'babel-eslint'
|
parser: '@babel/eslint-parser'
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
|
||||||
|
43
.woodpecker.yml
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
pipeline:
|
||||||
|
install dependencies:
|
||||||
|
image: node:19
|
||||||
|
commands:
|
||||||
|
- yarn install --immutable
|
||||||
|
pull: true
|
||||||
|
|
||||||
|
build:
|
||||||
|
image: node:19
|
||||||
|
commands:
|
||||||
|
- yarn build
|
||||||
|
secrets: [ vue_app_api_url, vue_app_track_url, vue_app_track_id, vue_app_tracking ]
|
||||||
|
pull: true
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
image: cschlosser/drone-ftps
|
||||||
|
settings:
|
||||||
|
hostname:
|
||||||
|
from_secret: ftp_host
|
||||||
|
src_dir: "/dist/"
|
||||||
|
clean_dir: true
|
||||||
|
secrets: [ ftp_username, ftp_password ]
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
event: [ push, tag ]
|
||||||
|
status: success
|
||||||
|
|
||||||
|
deploy (dev):
|
||||||
|
image: cschlosser/drone-ftps
|
||||||
|
settings:
|
||||||
|
hostname:
|
||||||
|
from_secret: ftp_host
|
||||||
|
src_dir: "/dist/"
|
||||||
|
clean_dir: true
|
||||||
|
secrets:
|
||||||
|
- source: ftp_username_dev
|
||||||
|
target: ftp_username
|
||||||
|
- source: ftp_password_dev
|
||||||
|
target: ftp_password
|
||||||
|
when:
|
||||||
|
branch: dev
|
||||||
|
event: [push, tag]
|
||||||
|
status: success
|
631
.yarn/releases/yarn-3.0.2.cjs
vendored
873
.yarn/releases/yarn-3.4.1.cjs
vendored
Executable file
@@ -4,4 +4,4 @@ plugins:
|
|||||||
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
|
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
|
||||||
spec: "@yarnpkg/plugin-interactive-tools"
|
spec: "@yarnpkg/plugin-interactive-tools"
|
||||||
|
|
||||||
yarnPath: .yarn/releases/yarn-3.0.2.cjs
|
yarnPath: .yarn/releases/yarn-3.4.1.cjs
|
||||||
|
60
Jenkinsfile
vendored
@@ -1,60 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent any
|
|
||||||
|
|
||||||
environment {
|
|
||||||
FTP_HOST = credentials('csgowtf-deploy-host')
|
|
||||||
LFTP_PASSWORD = credentials('csgowtf-deploy-password')
|
|
||||||
API_HOST = credentials('csgowtf-api-host')
|
|
||||||
TRACK_HOST = credentials('csgowtf-track-host')
|
|
||||||
TRACK_ID = credentials('csgowtf-track-id')
|
|
||||||
TRACK_DOMAINS = credentials('csgowtf-track-domains')
|
|
||||||
TRACK = credentials('csgowtf-track')
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('Prepare') {
|
|
||||||
steps {
|
|
||||||
writeFile file: '.env.production', text: 'VUE_APP_API_URL=$API_HOST\nVUE_APP_TRACK_URL=$TRACK_HOST\nVUE_APP_TRACK_ID=$TRACK_ID\nVUE_APP_TRACK_DOMAINS=$TRACK_DOMAINS\nVUE_APP_TRACKING=$TRACK'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('Install Dependencies') {
|
|
||||||
steps {
|
|
||||||
sh 'yarn install'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('Build') {
|
|
||||||
steps {
|
|
||||||
sh 'yarn build'
|
|
||||||
archiveArtifacts artifacts: '**/dist/**', excludes: '**/node_modules/**'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('Deploy') {
|
|
||||||
when {
|
|
||||||
branch 'master'
|
|
||||||
expression {
|
|
||||||
currentBuild.result == null || currentBuild.result == 'SUCCESS'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
FTP_USERNAME = credentials('csgowtf-deploy-user')
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
sh 'lftp -u $FTP_USERNAME --env-password -e \'mirror --reverse --verbose --delete --recursion=always dist/ /\' $FTP_HOST'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
stage('Deploy Dev') {
|
|
||||||
when {
|
|
||||||
branch 'dev'
|
|
||||||
expression {
|
|
||||||
currentBuild.result == null || currentBuild.result == 'SUCCESS'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
environment {
|
|
||||||
FTP_USERNAME = credentials('csgowtf-deploy-user-dev')
|
|
||||||
}
|
|
||||||
steps {
|
|
||||||
sh 'lftp -u $FTP_USERNAME --env-password -e \'mirror --reverse --verbose --delete --recursion=always dist/ /\' $FTP_HOST'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@@ -7,6 +7,7 @@
|
|||||||
[](https://liberapay.com/CSGOWTF/)
|
[](https://liberapay.com/CSGOWTF/)
|
||||||
[](https://csgow.tf/)
|
[](https://csgow.tf/)
|
||||||
<!--[](https://www.typescriptlang.org/)-->
|
<!--[](https://www.typescriptlang.org/)-->
|
||||||
|
[](https://ci.somegit.dev/CSGOWTF/csgowtf)
|
||||||
|
|
||||||
### Statistics for CS:GO matchmaking matches.
|
### Statistics for CS:GO matchmaking matches.
|
||||||
|
|
||||||
|
55
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "csgowtf",
|
"name": "csgowtf",
|
||||||
"version": "1.0.7",
|
"version": "1.0.9",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"serve": "vue-cli-service serve",
|
"serve": "vue-cli-service serve",
|
||||||
@@ -8,36 +8,39 @@
|
|||||||
"lint": "vue-cli-service lint"
|
"lint": "vue-cli-service lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@popperjs/core": "^2.11.2",
|
"@fontsource/open-sans": "^4.5.14",
|
||||||
"axios": "^0.25.0",
|
"@fontsource/orbitron": "^4.5.11",
|
||||||
"bootstrap": "^5.1.3",
|
"@popperjs/core": "^2.11.6",
|
||||||
"core-js": "^3.21.0",
|
"axios": "^1.3.4",
|
||||||
"dotenv-webpack": "^7.1.0",
|
"bootstrap": "^5.2.3",
|
||||||
"echarts": "^5.3.0",
|
"core-js": "^3.29.0",
|
||||||
|
"dotenv-webpack": "^8.0.1",
|
||||||
|
"echarts": "^5.4.1",
|
||||||
"fork-awesome": "^1.2.0",
|
"fork-awesome": "^1.2.0",
|
||||||
"http-status-codes": "^2.2.0",
|
"http-status-codes": "^2.2.0",
|
||||||
"iso-639-1": "^2.1.13",
|
"iso-639-1": "^2.1.15",
|
||||||
"jquery": "^3.6.0",
|
"jquery": "^3.6.3",
|
||||||
"luxon": "^2.3.0",
|
"luxon": "^3.2.1",
|
||||||
"string-sanitizer": "^2.0.2",
|
"string-sanitizer": "^2.0.2",
|
||||||
"vue": "^3.2.30",
|
"vue": "^3.2.47",
|
||||||
"vue-matomo": "^4.1.0",
|
"vue-matomo": "^4.2.0",
|
||||||
"vue-router": "^4.0.12",
|
"vue-router": "^4.1.6",
|
||||||
"vue3-cookies": "^1.0.6",
|
"vue3-cookies": "^1.0.6",
|
||||||
"vuex": "^4.0.2"
|
"vuex": "^4.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vue/cli-plugin-babel": "~4.5.15",
|
"@babel/core": "^7.21.0",
|
||||||
"@vue/cli-plugin-eslint": "~4.5.15",
|
"@babel/eslint-parser": "^7.19.1",
|
||||||
"@vue/cli-plugin-router": "~4.5.15",
|
"@vue/cli-plugin-babel": "~5.0.8",
|
||||||
"@vue/cli-plugin-vuex": "~4.5.15",
|
"@vue/cli-plugin-eslint": "~5.0.8",
|
||||||
"@vue/cli-service": "~4.5.15",
|
"@vue/cli-plugin-router": "~5.0.8",
|
||||||
"@vue/compiler-sfc": "^3.2.30",
|
"@vue/cli-plugin-vuex": "~5.0.8",
|
||||||
"babel-eslint": "^10.1.0",
|
"@vue/cli-service": "~5.0.8",
|
||||||
"eslint": "^6.8.0",
|
"@vue/compiler-sfc": "^3.2.47",
|
||||||
"eslint-plugin-vue": "^7.20.0",
|
"eslint": "^8.35.0",
|
||||||
"sass": "^1.49.7",
|
"eslint-plugin-vue": "^9.9.0",
|
||||||
"sass-loader": "^10.2.1"
|
"sass": "^1.58.3",
|
||||||
|
"sass-loader": "^13.2.0"
|
||||||
},
|
},
|
||||||
"packageManager": "yarn@3.0.2"
|
"packageManager": "yarn@3.4.1"
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 74 KiB |
2060
public/images/map_icons/map_icon_de_blagai.svg
Normal file
After Width: | Height: | Size: 213 KiB |
2069
public/images/map_icons/map_icon_de_prime.svg
Normal file
After Width: | Height: | Size: 214 KiB |
2060
public/images/map_icons/map_icon_de_tuscan.svg
Normal file
After Width: | Height: | Size: 213 KiB |
Before Width: | Height: | Size: 454 KiB |
BIN
public/images/map_screenshots/ar_baggage.png
Normal file
After Width: | Height: | Size: 2.1 MiB |
Before Width: | Height: | Size: 440 KiB After Width: | Height: | Size: 206 KiB |
Before Width: | Height: | Size: 425 KiB |
BIN
public/images/map_screenshots/ar_dizzy.png
Normal file
After Width: | Height: | Size: 1.8 MiB |
Before Width: | Height: | Size: 345 KiB After Width: | Height: | Size: 157 KiB |
Before Width: | Height: | Size: 592 KiB |
BIN
public/images/map_screenshots/ar_lunacy.png
Normal file
After Width: | Height: | Size: 3.0 MiB |
Before Width: | Height: | Size: 588 KiB After Width: | Height: | Size: 283 KiB |
Before Width: | Height: | Size: 528 KiB |
BIN
public/images/map_screenshots/ar_monastery.png
Normal file
After Width: | Height: | Size: 2.3 MiB |
Before Width: | Height: | Size: 326 KiB After Width: | Height: | Size: 154 KiB |
Before Width: | Height: | Size: 488 KiB |
BIN
public/images/map_screenshots/ar_shoots.png
Normal file
After Width: | Height: | Size: 2.4 MiB |
Before Width: | Height: | Size: 493 KiB After Width: | Height: | Size: 244 KiB |
Before Width: | Height: | Size: 586 KiB |
BIN
public/images/map_screenshots/coop_autumn.png
Normal file
After Width: | Height: | Size: 3.9 MiB |
Before Width: | Height: | Size: 615 KiB After Width: | Height: | Size: 355 KiB |
Before Width: | Height: | Size: 218 KiB |
BIN
public/images/map_screenshots/coop_fall.png
Normal file
After Width: | Height: | Size: 821 KiB |
Before Width: | Height: | Size: 104 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 284 KiB |
BIN
public/images/map_screenshots/coop_kasbah.png
Normal file
After Width: | Height: | Size: 1.3 MiB |
Before Width: | Height: | Size: 219 KiB After Width: | Height: | Size: 92 KiB |
Before Width: | Height: | Size: 424 KiB |
BIN
public/images/map_screenshots/cs_agency.png
Normal file
After Width: | Height: | Size: 1.5 MiB |
Before Width: | Height: | Size: 233 KiB After Width: | Height: | Size: 103 KiB |
Before Width: | Height: | Size: 511 KiB |
BIN
public/images/map_screenshots/cs_apollo.png
Normal file
After Width: | Height: | Size: 2.3 MiB |
Before Width: | Height: | Size: 260 KiB After Width: | Height: | Size: 116 KiB |
Before Width: | Height: | Size: 526 KiB |
BIN
public/images/map_screenshots/cs_assault.png
Normal file
After Width: | Height: | Size: 2.4 MiB |
Before Width: | Height: | Size: 466 KiB After Width: | Height: | Size: 213 KiB |
Before Width: | Height: | Size: 503 KiB |
BIN
public/images/map_screenshots/cs_climb.png
Normal file
After Width: | Height: | Size: 2.5 MiB |
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 289 KiB |
Before Width: | Height: | Size: 491 KiB |
BIN
public/images/map_screenshots/cs_cruise.png
Normal file
After Width: | Height: | Size: 2.1 MiB |
Before Width: | Height: | Size: 411 KiB After Width: | Height: | Size: 177 KiB |
Before Width: | Height: | Size: 502 KiB |
BIN
public/images/map_screenshots/cs_downtown.png
Normal file
After Width: | Height: | Size: 2.6 MiB |
Before Width: | Height: | Size: 588 KiB After Width: | Height: | Size: 286 KiB |
Before Width: | Height: | Size: 768 KiB |
BIN
public/images/map_screenshots/cs_insertion.png
Normal file
After Width: | Height: | Size: 3.4 MiB |
Before Width: | Height: | Size: 486 KiB After Width: | Height: | Size: 217 KiB |
Before Width: | Height: | Size: 619 KiB |
BIN
public/images/map_screenshots/cs_insertion2.png
Normal file
After Width: | Height: | Size: 3.5 MiB |
Before Width: | Height: | Size: 765 KiB After Width: | Height: | Size: 443 KiB |
Before Width: | Height: | Size: 412 KiB |
BIN
public/images/map_screenshots/cs_italy.png
Normal file
After Width: | Height: | Size: 1.8 MiB |
Before Width: | Height: | Size: 313 KiB After Width: | Height: | Size: 140 KiB |
Before Width: | Height: | Size: 486 KiB |
BIN
public/images/map_screenshots/cs_militia.png
Normal file
After Width: | Height: | Size: 2.3 MiB |
Before Width: | Height: | Size: 306 KiB After Width: | Height: | Size: 127 KiB |
Before Width: | Height: | Size: 458 KiB |
BIN
public/images/map_screenshots/cs_motel.png
Normal file
After Width: | Height: | Size: 2.1 MiB |
Before Width: | Height: | Size: 413 KiB After Width: | Height: | Size: 191 KiB |
Before Width: | Height: | Size: 608 KiB |
BIN
public/images/map_screenshots/cs_museum.png
Normal file
After Width: | Height: | Size: 2.9 MiB |
Before Width: | Height: | Size: 588 KiB After Width: | Height: | Size: 300 KiB |
Before Width: | Height: | Size: 475 KiB |
BIN
public/images/map_screenshots/cs_office.png
Normal file
After Width: | Height: | Size: 2.2 MiB |
Before Width: | Height: | Size: 484 KiB After Width: | Height: | Size: 235 KiB |
Before Width: | Height: | Size: 487 KiB |
BIN
public/images/map_screenshots/cs_rush.png
Normal file
After Width: | Height: | Size: 2.4 MiB |
Before Width: | Height: | Size: 454 KiB After Width: | Height: | Size: 226 KiB |
Before Width: | Height: | Size: 479 KiB |
BIN
public/images/map_screenshots/cs_seaside.png
Normal file
After Width: | Height: | Size: 2.2 MiB |
Before Width: | Height: | Size: 410 KiB After Width: | Height: | Size: 189 KiB |
Before Width: | Height: | Size: 544 KiB |
BIN
public/images/map_screenshots/cs_thunder.png
Normal file
After Width: | Height: | Size: 2.8 MiB |
Before Width: | Height: | Size: 620 KiB After Width: | Height: | Size: 305 KiB |
Before Width: | Height: | Size: 456 KiB |
BIN
public/images/map_screenshots/cs_workout.png
Normal file
After Width: | Height: | Size: 1.8 MiB |
Before Width: | Height: | Size: 344 KiB After Width: | Height: | Size: 153 KiB |
Before Width: | Height: | Size: 513 KiB |
BIN
public/images/map_screenshots/de_abbey.png
Normal file
After Width: | Height: | Size: 2.3 MiB |
Before Width: | Height: | Size: 471 KiB After Width: | Height: | Size: 235 KiB |
Before Width: | Height: | Size: 627 KiB |
BIN
public/images/map_screenshots/de_ancient.png
Normal file
After Width: | Height: | Size: 3.3 MiB |
Before Width: | Height: | Size: 639 KiB After Width: | Height: | Size: 298 KiB |
Before Width: | Height: | Size: 478 KiB |