Skip to content

Commit

Permalink
update deps (#7188)
Browse files Browse the repository at this point in the history
  • Loading branch information
DAcodedBEAT authored Oct 20, 2024
2 parents 55f6105 + b95e108 commit 910d2fe
Show file tree
Hide file tree
Showing 132 changed files with 957 additions and 605 deletions.
490 changes: 421 additions & 69 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,27 @@
"bootstrap-show-password": "^1.3.0",
"bootstrap-toggle": "^2.2.2",
"bootstrap-validator": "^0.11.9",
"chart.js": "^4.4.4",
"chart.js": "^4.4.5",
"ckeditor4": "^4.25.0",
"daterangepicker": "^3.1.0",
"flag-icons": "^7.2.3",
"fullcalendar": "^6.1.15",
"i18n": "^0.15.1",
"i18next": "^23.15.1",
"i18next": "^23.16.2",
"icheck-bootstrap": "^3.0.1",
"inputmask": "^5.0.9",
"jquery": "^3.7.1",
"jquery-photo-uploader": "^1.0.13",
"jquery-steps": "^1.1.0",
"jquery-validation": "^1.21.0",
"pace-js": "^1.2.4",
"react-bootstrap": "^2.10.4",
"react-datepicker": "^7.4.0",
"react-bootstrap": "^2.10.5",
"react-datepicker": "^7.5.0",
"react-select": "^5.8.1",
"select2": "^4.0.13"
},
"devDependencies": {
"@types/jquery": "^3.5.30",
"@types/jquery": "^3.5.31",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-loader": "^9.2.1",
Expand All @@ -107,16 +107,16 @@
"node-sha1": "^1.0.1",
"npm-run-all": "^4.1.5",
"prettier": "^3.3.3",
"sass": "^1.79.3",
"sass": "^1.80.3",
"tar": "^7.4.3",
"ts-loader": "^9.5.1",
"typescript": "^5.6.2",
"webpack": "^5.94.0",
"typescript": "^5.6.3",
"webpack": "^5.95.0",
"webpack-cli": "^5.0.0"
},
"optionalDependencies": {
"cy-verify-downloads": "^0.2.5",
"cypress": "^13.14.2",
"cypress": "^13.15.0",
"grunt-poeditor-gd": "^0.2.1"
}
}
}
4 changes: 2 additions & 2 deletions src/AddDonors.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Utils\InputUtils;
use ChurchCRM\Utils\RedirectUtils;
Expand Down
8 changes: 4 additions & 4 deletions src/BackupDatabase.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\SystemURLs;
Expand All @@ -12,7 +12,7 @@
AuthenticationManager::redirectHomeIfNotAdmin();

$sPageTitle = gettext('Backup Database');
require 'Include/Header.php';
require_once 'Include/Header.php';

?>
<div class="card">
Expand Down Expand Up @@ -54,4 +54,4 @@
<script src="<?= SystemURLs::getRootPath() ?>/skin/js/BackupDatabase.js"></script>

<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
8 changes: 4 additions & 4 deletions src/BatchWinnerEntry.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\model\ChurchCRM\DonatedItemQuery;
use ChurchCRM\Utils\InputUtils;
Expand Down Expand Up @@ -57,7 +57,7 @@
WHERE pn_fr_ID=' . $iCurrentFundraiser . ' ORDER BY pn_Num';
$rsPaddles = RunQuery($sPaddleSQL);

require 'Include/Header.php';
require_once 'Include/Header.php';

?>
<div class="card card-body">
Expand Down Expand Up @@ -120,4 +120,4 @@
</form>
</div>
<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
4 changes: 2 additions & 2 deletions src/CSVCreateFile.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\dto\Cart;
use ChurchCRM\dto\Classification;
Expand Down
8 changes: 4 additions & 4 deletions src/CSVExport.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\Utils\RedirectUtils;
Expand Down Expand Up @@ -41,7 +41,7 @@
}

$sPageTitle = gettext('CSV Export');
require 'Include/Header.php';
require_once 'Include/Header.php';
?>
<form method="post" action="CSVCreateFile.php">
<div class="row">
Expand Down Expand Up @@ -448,4 +448,4 @@

</form>
<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
10 changes: 5 additions & 5 deletions src/CSVImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace ChurchCRM;

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\SystemConfig;
Expand Down Expand Up @@ -99,7 +99,7 @@ public function assignRoles()
}

$sPageTitle = gettext('CSV Import');
require 'Include/Header.php'; ?>
require_once 'Include/Header.php'; ?>

<div class="card">
<div class="card-header">
Expand Down Expand Up @@ -246,7 +246,7 @@ public function assignRoles()
<BR><BR>
<?php
$sCountry = SystemConfig::getValue('sDefaultCountry');
require 'Include/CountryDropDown.php';
require_once 'Include/CountryDropDown.php';
echo gettext('Default country if none specified otherwise');

$sSQL = 'SELECT lst_OptionID, lst_OptionName FROM list_lst WHERE lst_ID = 1 ORDER BY lst_OptionSequence';
Expand Down Expand Up @@ -944,4 +944,4 @@ function GetAge(int $Month, int $Day, ?int $Year): int
</script>
<script src="<?= SystemURLs::getRootPath() ?>/skin/js/MemberView.js" ></script>
<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
8 changes: 4 additions & 4 deletions src/CartToEvent.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\Cart;
Expand Down Expand Up @@ -39,7 +39,7 @@
}

$sPageTitle = gettext('Add Cart to Event');
require 'Include/Header.php';
require_once 'Include/Header.php';

if (count($_SESSION['aPeopleCart']) > 0) {
$sSQL = 'SELECT event_id, event_title FROM events_event';
Expand Down Expand Up @@ -82,4 +82,4 @@
echo '<p align="center" class="callout callout-warning">' . gettext('Your cart is empty!') . '</p>';
}

require 'Include/Footer.php';
require_once 'Include/Footer.php';
12 changes: 6 additions & 6 deletions src/CartToFamily.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\SystemURLs;
Expand Down Expand Up @@ -134,7 +134,7 @@
}

$sPageTitle = gettext('Add Cart to Family');
require 'Include/Header.php';
require_once 'Include/Header.php';

echo $sError;
?>
Expand Down Expand Up @@ -272,7 +272,7 @@
<tr>
<td class="LabelColumn"><?= gettext('State') ?>:</td>
<td class="TextColumn">
<?php require 'Include/StateDropDown.php'; ?>
<?php require_once 'Include/StateDropDown.php'; ?>
OR
<input type="text" name="StateTextbox" value="<?php if ($sCountry != 'United States' && $sCountry != 'Canada') {
echo $sState;
Expand All @@ -292,7 +292,7 @@
<tr>
<td class="LabelColumn"><?= gettext('Country') ?>:</td>
<td class="TextColumnWithBottomBorder">
<?php require 'Include/CountryDropDown.php' ?>
<?php require_once 'Include/CountryDropDown.php' ?>
</td>
</tr>

Expand Down Expand Up @@ -350,4 +350,4 @@
?>
</div>
<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
8 changes: 4 additions & 4 deletions src/CartToGroup.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\Cart;
Expand Down Expand Up @@ -37,7 +37,7 @@
$ormGroups = GroupQuery::create()->orderByName()->find();

$sPageTitle = gettext('Add Cart to Group');
require 'Include/Header.php';
require_once 'Include/Header.php';

if (count($_SESSION['aPeopleCart']) > 0) {
?>
Expand Down Expand Up @@ -85,4 +85,4 @@
echo '<p align="center" class="LargeText">' . gettext('Your cart is empty!') . '</p>';
}

require 'Include/Footer.php';
require_once 'Include/Footer.php';
8 changes: 4 additions & 4 deletions src/Checkin.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

$sPageTitle = gettext('Event Checkin');

require 'Include/Config.php';
require 'Include/Functions.php';
require 'Include/Header.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';
require_once 'Include/Header.php';

use ChurchCRM\dto\SystemConfig;
use ChurchCRM\dto\SystemURLs;
Expand Down Expand Up @@ -417,7 +417,7 @@ function SetPersonHtml(element, perArr) {
}
}
</script>
<?php require 'Include/Footer.php';
<?php require_once 'Include/Footer.php';

function loadPerson($iPersonID)
{
Expand Down
4 changes: 2 additions & 2 deletions src/ChurchCRM/Bootstrapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -298,15 +298,15 @@ public static function systemFailure($message, $header = 'Setup failure'): void
if (!SystemConfig::isInitialized()) {
SystemConfig::init();
}
require '../Include/HeaderNotLoggedIn.php'; ?>
require_once '../Include/HeaderNotLoggedIn.php'; ?>
<div class='container'>
<h3>ChurchCRM – <?= _($header) ?></h3>
<div class='alert alert-danger text-center' style='margin-top: 20px;'>
<?= gettext($message) ?>
</div>
</div>
<?php
require '../Include/FooterNotLoggedIn.php';
require_once '../Include/FooterNotLoggedIn.php';
exit();
}
public static function isDBCurrent(): bool
Expand Down
8 changes: 4 additions & 4 deletions src/ConvertIndividualToFamily.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\model\ChurchCRM\Family;
Expand All @@ -17,7 +17,7 @@

$sPageTitle = gettext('Convert Individuals to Families');

require 'Include/Header.php';
require_once 'Include/Header.php';

$curUserId = AuthenticationManager::getCurrentUser()->getId();

Expand Down Expand Up @@ -105,4 +105,4 @@
echo '<a href="ConvertIndividualToFamily.php">' . gettext('Convert Next') . '</a><br><br>';
echo '<a href="ConvertIndividualToFamily.php?all=true">' . gettext('Convert All') . '</a><br>';

require 'Include/Footer.php';
require_once 'Include/Footer.php';
8 changes: 4 additions & 4 deletions src/DepositSlipEditor.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\SystemURLs;
Expand Down Expand Up @@ -59,7 +59,7 @@
$currentUser->setCurrentDeposit($iDepositSlipID);
$currentUser->save();

require 'Include/Header.php';
require_once 'Include/Header.php';
?>
<div class="row">
<div class="col-lg-7">
Expand Down Expand Up @@ -256,4 +256,4 @@
});
</script>
<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
8 changes: 4 additions & 4 deletions src/DirectoryReports.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

require 'Include/Config.php';
require 'Include/Functions.php';
require_once 'Include/Config.php';
require_once 'Include/Functions.php';

use ChurchCRM\Authentication\AuthenticationManager;
use ChurchCRM\dto\SystemConfig;
Expand All @@ -11,7 +11,7 @@
AuthenticationManager::redirectHomeIfFalse(AuthenticationManager::getCurrentUser()->isCreateDirectoryEnabled());

$sPageTitle = gettext('Directory reports');
require 'Include/Header.php';
require_once 'Include/Header.php';

?>
<div class="card card-body">
Expand Down Expand Up @@ -270,4 +270,4 @@
</form>
</div>
<?php
require 'Include/Footer.php';
require_once 'Include/Footer.php';
Loading

0 comments on commit 910d2fe

Please sign in to comment.