Skip to content

Commit

Permalink
Merge branch 'release/2.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
thordy committed Sep 12, 2023
2 parents f74b2d6 + c8f522f commit 456ff52
Show file tree
Hide file tree
Showing 123 changed files with 9,580 additions and 4,678 deletions.
3 changes: 2 additions & 1 deletion .browser-refresh-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ static/
log/
CHANGELOG.md
README.md
Dockerfile
Dockerfile
package-lock.json
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
# Changelog

A preview of major changes can be found in the Wiki ([Latest Changes](https://github.com/kcapp/frontend/wiki/Latest_Changes))

## [2.7.0] - 2023-09-12
#### Feature
- Automatically start next leg without needing to reload the page to improve load time, and get back to throwing quicker
- Forward clients back to main page from match result after 2 minutes
- New "Explore" tab on player statistics, to explore darts thrown
- Support for `ANY` and `MASTER` outs for `x01` legs
- Simplified input for `x01` legs

#### Changed
- Updated to use `Node.js v18`
- Updated dependencies to newer versions

## [2.6.0] - 2023-06-30
#### Feature
- Support for Tournament Presets
- New query parameter `officeId=<id>` for `/obs` view, to only forward on matches in a given office
- Practice against `first time`, `very easy`, `challenging` and `mvg` bots
- New button for swapping order if button input is enabled
Expand All @@ -17,7 +29,6 @@ A preview of major changes can be found in the Wiki ([Latest Changes](https://gi
- Bug where vocal announcement for Cricket would say "No score" instead of marks

## [2.5.0] - 2023-03-10

#### Feature
- Support multiple legs for Practice matches
- Player options to disable automatic score deduction per dart, and to show/hide checkout guide
Expand Down Expand Up @@ -190,6 +201,7 @@ A preview of major changes can be found in the Wiki ([Latest Changes](https://gi
- Multiple score entry methods
- Including [Unicorn Smartboard](https://github.com/kcapp/smartboard)

[2.7.0]: https://github.com/kcapp/frontend/compare/v2.6.0...v2.7.0
[2.6.0]: https://github.com/kcapp/frontend/compare/v2.5.0...v2.6.0
[2.5.0]: https://github.com/kcapp/frontend/compare/v2.4.0...v2.5.0
[2.4.0]: https://github.com/kcapp/frontend/compare/v2.3.0...v2.4.0
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create our build image
FROM node:14-alpine AS BUILD_IMAGE
FROM node:18-alpine AS BUILD_IMAGE

# Add git and curl
RUN apk update && apk add --no-cache git curl
Expand All @@ -15,7 +15,7 @@ RUN npm install --only=production
COPY . .

# Create actual image
FROM node:14-alpine
FROM node:18-alpine

WORKDIR /usr/src/kcapp

Expand Down
1 change: 1 addition & 0 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ app.io = io;
app.locals.kcapp = {};
app.locals.kcapp.api = process.env.KCAPP_API || 'http://localhost:8001';
app.locals.kcapp.api_path = process.env.KCAPP_API_PATH || ':8001';
app.locals.kcapp.local_admin = process.env.KCAPP_LOCAL_ADMIN ? process.env.KCAPP_LOCAL_ADMIN === "true" : true;

// Create all routes
const socketHandler = require('./routes/lib/socketio_handler')(io, app);
Expand Down
6,596 changes: 2,658 additions & 3,938 deletions package-lock.json

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kcapp",
"version": "2.6.0",
"version": "2.7.0",
"private": true,
"scripts": {
"dev": "browser-refresh ./bin/www",
Expand All @@ -9,37 +9,37 @@
"start": "node ./bin/www"
},
"dependencies": {
"@lasso/marko-taglib": "^2.0.3",
"@marko/compiler": "^5.15.4",
"@marko/express": "^1.0.0",
"@lasso/marko-taglib": "^2.0.5",
"@marko/compiler": "^5.30.1",
"@marko/express": "^2.1.0",
"alertifyjs": "^1.13.1",
"axios": "^0.21.2",
"body-parser": "^1.19.0",
"body-parser": "^1.20.2",
"bottleneck": "^2.18.0",
"browser-refresh": "^1.7.3",
"browser-refresh-taglib": "^1.1.0",
"chart.js": "^3.5.1",
"browser-refresh-taglib": "^1.2.1",
"chart.js": "^3.9.1",
"compression": "^1.7.4",
"cookie-parser": "^1.4.5",
"cookie-parser": "^1.4.6",
"debug": "^4.3.2",
"dissolve": "^0.3.3",
"express": "^5.0.0-alpha.8",
"kcapp-bot": "github:kcapp/bot#f6e02174c98c0e3eb6ae02291d4aea6c0688b46f",
"dissolve": "^0.2.1",
"express": "^4.18.2",
"kcapp-bot": "github:kcapp/bot#bf4fd3503cbc5e05e8193c52f58daa520803f4e1",
"kcapp-sio-client": "github:kcapp/kcapp-sio-client",
"lasso": "^3.4.3",
"lasso-less": "^4.0.1",
"lasso-marko": "^3.1.0",
"less-middleware": "^3.1.0",
"marko": "^5.15.5",
"lasso": "^4.0.3",
"lasso-less": "^4.0.2",
"lasso-marko": "^3.2.1",
"less-middleware": "^2.2.1",
"marko": "^5.28.1",
"mobile-detect": "^1.4.5",
"moment": "^2.29.1",
"moment": "^2.29.4",
"morgan": "^1.10.0",
"rotating-file-stream": "^2.1.5",
"rotating-file-stream": "^3.1.0",
"serve-favicon": "^2.5.0",
"socket.io": "^4.2.0",
"socket.io-client": "^4.2.0",
"underscore": "^1.13.1",
"uuid": "^8.3.2",
"underscore": "^1.13.6",
"uuid": "^9.0.0",
"xmldom": "^0.6.0"
},
"devDependencies": {
Expand Down
109 changes: 109 additions & 0 deletions public/images/badges/100-1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
121 changes: 121 additions & 0 deletions public/images/badges/100-2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 456ff52

Please sign in to comment.