flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ready check back.

Browse source
This commit is contained in:
flash 2018-01-03 17:49:20 +01:00
parent 3b2552523a
commit 6fd82da2d9
4 changed files with 47 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
routes.php
View file

@ -4,4 +4,5 @@ use Misuzu\Controllers\HomeController;
return [
Route::get('/', 'index', HomeController::class),
Route::get('/is_ready', 'isReady', HomeController::class),
];

24
src/Application.php
View file

@ -58,21 +58,23 @@ class Application
throw new \Exception('Invalid property.');
}
protected function __construct($config = null)
protected function __construct($configFile = null)
{
ExceptionHandler::register();
$this->addModule('router', new RouteCollection);
$this->addModule('templating', new TemplateEngine);
$this->addModule('config', new ConfigManager($config));
$this->addModule('router', $router = new RouteCollection);
$this->addModule('templating', $twig = new TemplateEngine);
$this->addModule('config', $config = new ConfigManager($configFile));
$this->templating->addFilter('json_decode');
$this->templating->addFilter('byte_symbol');
$this->templating->addFunction('byte_symbol');
$this->templating->addFunction('session_id');
$this->templating->addFunction('config', [$this->config, 'get']);
$this->templating->addFunction('route', [$this->router, 'url']);
$this->templating->addPath('nova', __DIR__ . '/../views/nova');
$twig->addFilter('json_decode');
$twig->addFilter('byte_symbol');
$twig->addFunction('byte_symbol');
$twig->addFunction('session_id');
$twig->addFunction('config', [$config, 'get']);
$twig->addFunction('route', [$router, 'url']);
$twig->addFunction('git_hash', [Application::class, 'gitCommitHash']);
$twig->addFunction('git_branch', [Application::class, 'gitBranch']);
$twig->addPath('nova', __DIR__ . '/../views/nova');
}
public function __destruct()

8
src/Controllers/HomeController.php
View file

@ -9,9 +9,11 @@ class HomeController extends Controller
{
$twig = Application::getInstance()->templating;
$twig->addFunction('git_hash', [Application::class, 'gitCommitHash']);
$twig->addFunction('git_branch', [Application::class, 'gitBranch']);
return $twig->render('home.landing');
}
public function isReady(): string
{
return 'no';
}
}

32
views/nova/home/landing.twig
View file

@ -57,7 +57,10 @@
countdownFlashingTicks = 0,
countdownLastString = '',
countdownFinish,
countdownIgnoreHidden = false;
countdownIgnoreHidden = false,
continueChecking = true,
checkClient = null,
checkTimeout;
function countdownSetup(container, target, finish) {
countdownFinish = finish || null;
@ -170,11 +173,32 @@
countdownDigits[i].setAttribute('data-digit', str[i]);
}
window.onload = function () {
function checkIfFlashiiReady(continuous) {
continueChecking = !(!continuous);
if (checkClient === null) {
checkClient = new XMLHttpRequest();
checkClient.addEventListener('readystatechange', function () {
if (checkClient.readyState === 4 && (checkClient.status !== 200 || checkClient.responseText !== 'no'))
location.reload(true);
});
}
checkClient.open('GET', '/is_ready?' + Date.now(), true);
checkClient.send();
if (continueChecking)
checkTimeout = setTimeout(function () { checkIfFlashiiReady(continueChecking); }, 1000);
}
window.addEventListener("load", function () {
var container = document.createElement('div');
container.className = 'countdown-container';
document.getElementById('countdown').appendChild(container);
countdownSetup(container, new Date("Mon, 1 27 2018 1:00:00 +0100"));
}
countdownSetup(container, new Date("Mon, 1 27 2018 1:00:00 +0100"), function () {
checkIfFlashiiReady(true);
});
});
</script>
{% endblock %}