diff --git a/composer.lock b/composer.lock index ab68be5..8087ed3 100644 --- a/composer.lock +++ b/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "39b38af13b004d514b8fa19e295ad0d9", @@ -141,16 +141,16 @@ }, { "name": "monolog/monolog", - "version": "1.23.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -215,7 +215,7 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "nikic/fast-route", @@ -265,16 +265,16 @@ }, { "name": "phpmailer/phpmailer", - "version": "v6.0.5", + "version": "v6.0.6", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32" + "reference": "8190d73eb5def11a43cfb020b7f36db65330698c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/cb3ea134d4d3729e7857737d5f320cce9caf4d32", - "reference": "cb3ea134d4d3729e7857737d5f320cce9caf4d32", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/8190d73eb5def11a43cfb020b7f36db65330698c", + "reference": "8190d73eb5def11a43cfb020b7f36db65330698c", "shasum": "" }, "require": { @@ -327,7 +327,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2018-03-27T13:49:45+00:00" + "time": "2018-11-16T00:41:32+00:00" }, { "name": "pimple/pimple", @@ -532,16 +532,16 @@ }, { "name": "psr/http-server-handler", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-server-handler.git", - "reference": "439d92054dc06097f2406ec074a2627839955a02" + "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/439d92054dc06097f2406ec074a2627839955a02", - "reference": "439d92054dc06097f2406ec074a2627839955a02", + "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7", + "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7", "shasum": "" }, "require": { @@ -581,7 +581,7 @@ "response", "server" ], - "time": "2018-01-22T17:04:15+00:00" + "time": "2018-10-30T16:46:14+00:00" }, { "name": "psr/http-server-middleware", @@ -638,16 +638,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -681,7 +681,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "slim/flash", @@ -855,7 +855,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -913,16 +913,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", "shasum": "" }, "require": { @@ -968,7 +968,7 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "tuupola/callable-handler", @@ -2425,16 +2425,16 @@ }, { "name": "symfony/yaml", - "version": "v4.1.6", + "version": "v4.1.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "367e689b2fdc19965be435337b50bc8adf2746c9" + "reference": "fe87e3b24d15ec8948f0280ee867a65ca44fdbaa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9", - "reference": "367e689b2fdc19965be435337b50bc8adf2746c9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/fe87e3b24d15ec8948f0280ee867a65ca44fdbaa", + "reference": "fe87e3b24d15ec8948f0280ee867a65ca44fdbaa", "shasum": "" }, "require": { @@ -2480,7 +2480,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-10-02T16:36:10+00:00" + "time": "2018-11-11T19:51:29+00:00" }, { "name": "webmozart/assert", diff --git a/db/surfaces2018.db b/db/clam2020.db similarity index 95% rename from db/surfaces2018.db rename to db/clam2020.db index 807535c..1b5bf3d 100644 Binary files a/db/surfaces2018.db and b/db/clam2020.db differ diff --git a/public/img/headerpic2.jpg b/public/img/headerpic2.jpg index 23b4faa..a01aa55 100644 Binary files a/public/img/headerpic2.jpg and b/public/img/headerpic2.jpg differ diff --git a/src/routes.php b/src/routes.php index fb03aae..13a2944 100644 --- a/src/routes.php +++ b/src/routes.php @@ -50,8 +50,8 @@ $app->get('/practicalinfo', function (Request $request, Response $response, arra return $this->renderer->render($response, 'practicalinfo.html', $args); }); -$app->get('/invitedspeakers', function (Request $request, Response $response, array $args) { - $this->logger->info("GDDWorkshop '/invitedspeakers' route"); +$app->get('/plenaryspeakers', function (Request $request, Response $response, array $args) { + $this->logger->info("GDDWorkshop '/plenaryspeakers' route"); try { $speakers = $this->db->getSpeakers(); } catch (Exception $e) { @@ -59,7 +59,7 @@ $app->get('/invitedspeakers', function (Request $request, Response $response, ar $this->flash->addMessageNow("Get Speakers", "DB error: ".$e->getMessage()); } - return $this->renderer->render($response, 'invitedspeakers.html', + return $this->renderer->render($response, 'plenaryspeakers.html', ['speakers' => $speakers]); }); diff --git a/src/settings.php b/src/settings.php index 0bc34cd..1c9d316 100644 --- a/src/settings.php +++ b/src/settings.php @@ -23,7 +23,7 @@ return [ 'level' => \Monolog\Logger::DEBUG, ], 'db' => [ - 'path' => __DIR__."/../db/surfaces2018.db", + 'path' => __DIR__."/../db/clam2020.db", 'schema' => __DIR__."/../db/schema.sql", 'load_schema' => __DIR__."/../db/.schema.lock" ], diff --git a/templates/header.html b/templates/header.html index f4dbb36..2852843 100644 --- a/templates/header.html +++ b/templates/header.html @@ -35,13 +35,13 @@ diff --git a/templates/invitedspeakers.html b/templates/plenaryspeakers.html similarity index 89% rename from templates/invitedspeakers.html rename to templates/plenaryspeakers.html index 2c54313..8e30590 100644 --- a/templates/invitedspeakers.html +++ b/templates/plenaryspeakers.html @@ -2,7 +2,7 @@ {% block content %}
-

Invited Speakers

+

Plenary Speakers