Update directory structure
This commit is contained in:
parent
7dd14b0416
commit
c5531d21cf
|
@ -17,7 +17,7 @@ module.exports = grunt => {
|
||||||
files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}]
|
files: [{expand: true, cwd: "src/main/", src: "**/*.html", dest: "dist/", flatten: true}]
|
||||||
},
|
},
|
||||||
php: {
|
php: {
|
||||||
files: [{expand: true, cwd: "src/main/", src: "**/*.php", dest: "dist/", flatten: true}]
|
files: [{expand: true, cwd: "src/main/", src: "**/*.php", dest: "dist/", flatten: false}]
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
focus: {
|
focus: {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "fwdekker/death-notifier",
|
"name": "fwdekker/death-notifier",
|
||||||
"description": "Get notified when a famous person dies.",
|
"description": "Get notified when a famous person dies.",
|
||||||
"version": "0.0.3",
|
"version": "0.0.4",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"homepage": "https://git.fwdekker.com/tools/death-notifier",
|
"homepage": "https://git.fwdekker.com/tools/death-notifier",
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"main\\": "./"
|
"php\\": "php/"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"minimum-stability": "stable"
|
"minimum-stability": "stable"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "death-notifier",
|
"name": "death-notifier",
|
||||||
"version": "0.0.3",
|
"version": "0.0.4",
|
||||||
"description": "Get notified when a famous person dies.",
|
"description": "Get notified when a famous person dies.",
|
||||||
"author": "Florine W. Dekker",
|
"author": "Florine W. Dekker",
|
||||||
"browser": "dist/bundle.js",
|
"browser": "dist/bundle.js",
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace main;
|
|
||||||
|
|
||||||
use Exception;
|
|
||||||
use Monolog\ErrorHandler;
|
use Monolog\ErrorHandler;
|
||||||
use Monolog\Handler\BrowserConsoleHandler;
|
|
||||||
use Monolog\Handler\StreamHandler;
|
use Monolog\Handler\StreamHandler;
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
||||||
use SQLite3;
|
use php\Mailer;
|
||||||
|
use php\Mediawiki;
|
||||||
|
use php\Response;
|
||||||
|
use php\TrackingManager;
|
||||||
|
use php\UserManager;
|
||||||
|
|
||||||
/** @noinspection PhpIncludeInspection Exists after `npm run deploy` */
|
/** @noinspection PhpIncludeInspection Exists after `npm run deploy` */
|
||||||
require_once __DIR__ . "/vendor/autoload.php";
|
require_once __DIR__ . "/vendor/autoload.php";
|
||||||
|
@ -62,7 +62,8 @@ function generate_csrf_token(): string
|
||||||
}
|
}
|
||||||
|
|
||||||
session_start();
|
session_start();
|
||||||
$_SESSION["token"] = generate_csrf_token();
|
if (!isset($_SESSION["token"]))
|
||||||
|
$_SESSION["token"] = generate_csrf_token();
|
||||||
|
|
||||||
// Read JSON from POST
|
// Read JSON from POST
|
||||||
$_POST = json_decode(file_get_contents("php://input"), associative: true);
|
$_POST = json_decode(file_get_contents("php://input"), associative: true);
|
||||||
|
@ -200,7 +201,7 @@ if (isset($_POST["action"])) {
|
||||||
$response = match ($_GET["action"]) {
|
$response = match ($_GET["action"]) {
|
||||||
"get-user-data" => validate_logged_in() ?? $user_manager->get_user_data($_SESSION["uuid"]),
|
"get-user-data" => validate_logged_in() ?? $user_manager->get_user_data($_SESSION["uuid"]),
|
||||||
"list-trackings" => validate_logged_in() ?? $tracking_manager->list_trackings($_SESSION["uuid"]),
|
"list-trackings" => validate_logged_in() ?? $tracking_manager->list_trackings($_SESSION["uuid"]),
|
||||||
"is-alive" => $mediawiki->people_are_alive(array("Janelle Monáe", "John Malkovich", "Adolf Hitler")),
|
"is-alive" => $mediawiki->people_are_alive(array("John Cusack", "Cameron Diaz", "John Malkovich")),
|
||||||
default => new Response("Unknown GET action '" . $_GET["action"] . "'.", false),
|
default => new Response("Unknown GET action '" . $_GET["action"] . "'.", false),
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace main;
|
namespace php;
|
||||||
|
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
||||||
use PHPMailer\PHPMailer\Exception;
|
use PHPMailer\PHPMailer\Exception;
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace main;
|
namespace php;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
||||||
|
@ -87,6 +87,7 @@ class Mediawiki
|
||||||
$pages = array_values($response["query"]["pages"]);
|
$pages = array_values($response["query"]["pages"]);
|
||||||
$page_names = array_column($pages, "title");
|
$page_names = array_column($pages, "title");
|
||||||
$page_categories = array_column($pages, "categories");
|
$page_categories = array_column($pages, "categories");
|
||||||
|
// TODO: Differentiate between living, dead, missing, presumed dead, etc.
|
||||||
$is_alive = fn($it): bool => in_array("Category:Living people", array_column($it, "title"));
|
$is_alive = fn($it): bool => in_array("Category:Living people", array_column($it, "title"));
|
||||||
$alive_results = array_combine($page_names, array_map($is_alive, $page_categories));
|
$alive_results = array_combine($page_names, array_map($is_alive, $page_categories));
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace main;
|
namespace php;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace main;
|
namespace php;
|
||||||
|
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
||||||
use SQLite3;
|
use SQLite3;
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace main;
|
namespace php;
|
||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
use Monolog\Logger;
|
use Monolog\Logger;
|
Loading…
Reference in New Issue