Skip to content

Commit

Permalink
Merge pull request #2828 from xibosignage/feature/kopff_merge_into_dev
Browse files Browse the repository at this point in the history
Feature/kopff merge into dev
  • Loading branch information
dasgarner authored Dec 18, 2024
2 parents 858fb5b + a56f080 commit f7f6502
Show file tree
Hide file tree
Showing 187 changed files with 139,369 additions and 22,245 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RUN find -type d -name '.git' -exec rm -r {} + && \

# Stage 2
# Run webpack
FROM node:12 AS webpack
FROM node:22 AS webpack
WORKDIR /app

# Copy package.json and the webpack config file
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN composer install --no-interaction

# Stage 2
# Run webpack
FROM node:12 AS webpack
FROM node:22 AS webpack
WORKDIR /app

# Copy package.json and the webpack config file
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ npm run build
Alternatively you can use a Docker container:

```shell
docker run -it --volume $PWD:/app --volume ~/.npm:/root/.npm -w /app node:12 sh -c "npm install webpack -g; npm install; npm run build;"
docker run -it --volume $PWD:/app --volume ~/.npm:/root/.npm -w /app node:22 sh -c "npm install webpack -g; npm install; npm run build;"
```

### Mapped Volumes
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
"selective/samesite-cookie": "0.3.0",
"nesbot/carbon": "2.66.*",
"jmikola/geojson": "^1.0",
"symfony/yaml": "5.4.*"
"symfony/yaml": "5.4.*",
"mjaschen/phpgeo": "^5.0"
},
"require-dev": {
"phpunit/phpunit": "10.0.*",
Expand Down
85 changes: 84 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions db/migrations/20240903142530_add_cap_connector_migration.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
/*
* Copyright (C) 2023 Xibo Signage Ltd
*
* Xibo - Digital Signage - http://www.xibo.org.uk
*
* This file is part of Xibo.
*
* Xibo is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* Xibo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Xibo. If not, see <http://www.gnu.org/licenses/>.
*/

use Phinx\Migration\AbstractMigration;

/**
* Add a new connector (Common Alert Protocol - CAP) to connectors table
* @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
*/
class AddCapConnectorMigration extends AbstractMigration
{
public function change()
{
$this->table('connectors')
->insert([
'className' => '\\Xibo\\Connector\\CapConnector',
'isEnabled' => 1,
'isVisible' => 1
])
->save();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php
/*
* Copyright (C) 2024 Xibo Signage Ltd
*
* Xibo - Digital Signage - http://www.xibo.org.uk
*
* This file is part of Xibo.
*
* Xibo is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
*
* Xibo is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Xibo. If not, see <http://www.gnu.org/licenses/>.
*/

use Phinx\Migration\AbstractMigration;

/**
* Add a new connector (Open Weather Map) to connectors table
* @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
*/
class AddFolderFilterToPlaylistTableMigration extends AbstractMigration
{
public function change()
{
$this->table('playlist')
->addColumn('filterFolderId', 'integer', ['after' => 'filterMediaTagsLogicalOperator', 'default' => null,
'null' => true])
->save();
}
}
41 changes: 41 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import globals from 'globals';
import path from 'node:path';
import {fileURLToPath} from 'node:url';
import js from '@eslint/js';
import {FlatCompat} from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [...compat.extends('google'), {
languageOptions: {
globals: {
...globals.browser,
},

ecmaVersion: 'latest',
sourceType: 'module',
},

settings: {},
rules: {
indent: ['error', 2, {
SwitchCase: 1,
}],

'quote-props': ['warn', 'as-needed'],
'dot-location': ['warn', 'property'],
'linebreak-style': [0, 'error', 'windows'],
'valid-jsdoc': 'off',
'require-jsdoc': 'off',
'new-cap': 'off',
},
}, {
files: ['**/*.js'],
rules: {},
}];
Loading

0 comments on commit f7f6502

Please sign in to comment.