Merge branch 'develop' into feature/add-frontend-server-configuration

This commit is contained in:
Dane Everitt 2017-10-18 22:37:23 -05:00
commit f98eb5904c
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 71 additions and 9 deletions

View file

@ -13,7 +13,7 @@ DB_DATABASE=homestead
DB_USERNAME=homestead DB_USERNAME=homestead
DB_PASSWORD=secret DB_PASSWORD=secret
CACHE_DRIVER=file CACHE_DRIVER=redis
SESSION_DRIVER=database SESSION_DRIVER=database
HASHIDS_SALT= HASHIDS_SALT=

View file

@ -15,6 +15,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-pdo_mysql": "*", "ext-pdo_mysql": "*",
"ext-zip": "*", "ext-zip": "*",
"appstract/laravel-blade-directives": "^0.6.0",
"aws/aws-sdk-php": "^3.29", "aws/aws-sdk-php": "^3.29",
"daneeveritt/login-notifications": "^1.0", "daneeveritt/login-notifications": "^1.0",
"doctrine/dbal": "^2.5", "doctrine/dbal": "^2.5",

55
composer.lock generated
View file

@ -4,8 +4,61 @@
"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#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "46a0a06ec8f3af50ed6ec05c2bb3b9a3", "content-hash": "416fbdc30098799c4403f9d05413b029",
"packages": [ "packages": [
{
"name": "appstract/laravel-blade-directives",
"version": "0.6.0",
"source": {
"type": "git",
"url": "https://github.com/appstract/laravel-blade-directives.git",
"reference": "3b0e146b3f2511d69e51160e7312ed5e57616460"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appstract/laravel-blade-directives/zipball/3b0e146b3f2511d69e51160e7312ed5e57616460",
"reference": "3b0e146b3f2511d69e51160e7312ed5e57616460",
"shasum": ""
},
"require": {
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Appstract\\BladeDirectives\\BladeDirectivesServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Appstract\\BladeDirectives\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Gijs Jorissen",
"email": "hello@appstract.team",
"homepage": "https://appstract.team",
"role": "Developer"
}
],
"description": "Handy Blade directives",
"homepage": "https://github.com/appstract/laravel-blade-directives",
"keywords": [
"appstract",
"laravel-blade-directives"
],
"time": "2017-10-13T08:41:27+00:00"
},
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.36.0", "version": "3.36.0",

View file

@ -181,6 +181,7 @@ return [
Lord\Laroute\LarouteServiceProvider::class, Lord\Laroute\LarouteServiceProvider::class,
Spatie\Fractal\FractalServiceProvider::class, Spatie\Fractal\FractalServiceProvider::class,
Sofa\Eloquence\ServiceProvider::class, Sofa\Eloquence\ServiceProvider::class,
Appstract\BladeDirectives\BladeDirectivesServiceProvider::class,
], ],
/* /*

View file

@ -61,6 +61,7 @@
opacity: .5; opacity: .5;
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
z-index: 10;
} }
.terminal-notify:hover { .terminal-notify:hover {

View file

@ -116,13 +116,15 @@ $(document).ready(function () {
}); });
$terminal.on('scroll', function () { $terminal.on('scroll', function () {
if ($(this).scrollTop() + $(this).innerHeight() + 50 < $(this)[0].scrollHeight) { if (isTerminalScrolledDown()) {
$scrollNotify.removeClass('hidden');
} else {
$scrollNotify.addClass('hidden'); $scrollNotify.addClass('hidden');
} }
}); });
function isTerminalScrolledDown() {
return $terminal.scrollTop() + $terminal.innerHeight() + 50 > $terminal[0].scrollHeight;
}
window.scrollToBottom = function () { window.scrollToBottom = function () {
$terminal.scrollTop($terminal[0].scrollHeight); $terminal.scrollTop($terminal[0].scrollHeight);
}; };
@ -148,17 +150,21 @@ function pushToTerminal(string) {
} }
if (TerminalQueue.length > 0) { if (TerminalQueue.length > 0) {
var scrolledDown = isTerminalScrolledDown();
for (var i = 0; i < CONSOLE_PUSH_COUNT && TerminalQueue.length > 0; i++) { for (var i = 0; i < CONSOLE_PUSH_COUNT && TerminalQueue.length > 0; i++) {
pushToTerminal(TerminalQueue[0]); pushToTerminal(TerminalQueue[0]);
if (! $scrollNotify.is(':visible')) {
window.scrollToBottom();
}
window.ConsoleElements++; window.ConsoleElements++;
TerminalQueue.shift(); TerminalQueue.shift();
} }
if (scrolledDown) {
window.scrollToBottom();
} else if ($scrollNotify.hasClass('hidden')) {
$scrollNotify.removeClass('hidden');
}
var removeElements = window.ConsoleElements - CONSOLE_OUTPUT_LIMIT; var removeElements = window.ConsoleElements - CONSOLE_OUTPUT_LIMIT;
if (removeElements > 0) { if (removeElements > 0) {
$('#terminal').find('.cmd').slice(0, removeElements).remove(); $('#terminal').find('.cmd').slice(0, removeElements).remove();