allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #206 from allerta-vvf/master 

[skip-ci] fixes
This commit is contained in:
Matteo Gheza 2021-04-30 23:32:24 +02:00 committed by GitHub
parent 7f4a3cb403 2dcc4ef14f
commit a8335bf56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 346 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/php.yml vendored
View File

@ -186,7 +186,7 @@ jobs:
run: |
ls
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging" ] ]; ?>' > deployment_remotes.php
echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
cat deployment_remotes.php
ls
php deployment.phar deployment.php --section staging
@ -232,7 +232,7 @@ jobs:
run: |
ls
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod" ] ]; ?>' > deployment_remotes.php
echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
cat deployment_remotes.php
ls
php deployment.phar deployment.php --section production

14
server/cron.php
View File

@ -3,19 +3,7 @@ require_once 'core.php';
init_class(false);
header('Content-Type: application/json');
function customErrorHandler(int $errNo, string $errMsg, string $file, int $line)
{
$output = [
"errNo" => $errNo,
"error" => $errMsg,
"file" => $file,
"line" => $line
];
var_dump($output);
}
error_reporting(-1);
set_error_handler('customErrorHandler');
list($cronJobDay, $cronJobTime) = explode(";", $database->get_option("cron_job_time"));
@ -73,7 +61,7 @@ if($start) {
$increment[$id] = $value;
$database->exec("UPDATE %PREFIX%_profiles SET availability_minutes = :value WHERE id = :id", true, [":value" => $value, ":id" => $id]);
$tmp = $id . " - " . $value . " ";
$tmp .= count($database->stmt->rowCount()) == 1 ? "success" : "fail";
$tmp .= $database->stmt->rowCount() == 1 ? "success" : "fail";
$queries[] = $tmp;
}
$output[] = $queries;

3
server/modal_availability_schedule.php
View File

@ -53,6 +53,9 @@ if(!empty($result)){
$old_schedules[$schedule[0]][$hour] = true;
}
$old_holidays = json_decode($result[0]["holidays"]);
if(is_null($old_holidays)){
$old_holidays = [];
}
} else {
$old_schedules = [];
$old_holidays = [];

572
server/resources/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
server/resources/package.json
View File

@ -11,13 +11,13 @@
"author": "",
"license": "GPL3",
"dependencies": {
"@babel/core": "^7.13.16",
"@babel/core": "^7.14.0",
"@babel/plugin-transform-runtime": "^7.13.15",
"@babel/preset-env": "^7.13.15",
"@babel/preset-env": "^7.14.0",
"@fiverr/afterbuild-webpack-plugin": "^1.0.0",
"@fortawesome/fontawesome-free": "^5.15.3",
"@sentry/browser": "^6.3.3",
"@sentry/tracing": "^6.3.3",
"@sentry/browser": "^6.3.4",
"@sentry/tracing": "^6.3.4",
"@sentry/webpack-plugin": "^1.15.1",
"babel-loader": "^8.2.2",
"bootstrap": "^4.6.0",
@ -27,9 +27,9 @@
"colors": "^1.4.0",
"copy-webpack-plugin": "^8.1.1",
"css-loader": "^5.2.4",
"datatables.net-bs4": "^1.10.24",
"datatables.net-buttons-bs4": "^1.7.0",
"datatables.net-plugins": "^1.10.24",
"datatables.net-bs4": "^1.10.23",
"datatables.net-buttons-bs4": "^1.6.5",
"datatables.net-plugins": "^1.10.23",
"datatables.net-responsive-bs4": "^2.2.7",
"expose-loader": "^2.0.0",
"file-loader": "^6.2.0",