From 2f40f4737ce2509246c2e3344ac2cff9529322b9 Mon Sep 17 00:00:00 2001 From: Nabeel S Date: Fri, 28 Feb 2020 18:00:56 -0500 Subject: [PATCH] Installer fixes, remove bcmath, fix design (#596) * Installer cleanup * Installer design fixes --- composer.json | 1 + modules/Installer/Config/config.php | 2 +- .../Http/Controllers/InstallerController.php | 2 +- .../Installer/Resources/views/app.blade.php | 47 ++++++++++++++----- .../steps/step1-requirements.blade.php | 6 +-- .../views/install/steps/step2-db.blade.php | 2 +- resources/docker/php/Dockerfile | 1 + .../sass/now-ui/now-ui-kit/_sections.scss | 4 ++ 8 files changed, 47 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 672f8f8d..046b0689 100755 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "ext-json": "*", "ext-mbstring": "*", "ext-simplexml": "*", + "ext-bcmath": "*", "ext-pdo": "*", "composer/composer": "~1.8.0", "composer/installers": "~1.0", diff --git a/modules/Installer/Config/config.php b/modules/Installer/Config/config.php index 22fdc4d3..227cd297 100644 --- a/modules/Installer/Config/config.php +++ b/modules/Installer/Config/config.php @@ -15,7 +15,7 @@ return [ ], 'extensions' => [ - 'bcmath', + // 'bcmath', 'openssl', 'pdo', 'mbstring', diff --git a/modules/Installer/Http/Controllers/InstallerController.php b/modules/Installer/Http/Controllers/InstallerController.php index fb4e5720..e8fd10f7 100644 --- a/modules/Installer/Http/Controllers/InstallerController.php +++ b/modules/Installer/Http/Controllers/InstallerController.php @@ -64,7 +64,7 @@ class InstallerController extends Controller $this->seederSvc = $seederSvc; $this->userService = $userService; - \App\Support\Utils::disableDebugToolbar(); + Utils::disableDebugToolbar(); } /** diff --git a/modules/Installer/Resources/views/app.blade.php b/modules/Installer/Resources/views/app.blade.php index 425c7318..709b62eb 100644 --- a/modules/Installer/Resources/views/app.blade.php +++ b/modules/Installer/Resources/views/app.blade.php @@ -35,9 +35,9 @@ - + ---}} -{{--
--}} -
-
-
-
-
- @include('installer::flash.message') - @yield('content') +
+{{--
--}} +
+
+
+
+
+ +
+ +
-
{{----}} diff --git a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php index e006d644..e810f79b 100644 --- a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php +++ b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php @@ -10,7 +10,7 @@ PHP Version: {{ $php['version'] }} - + @if($php['passed'] === true) OK @else @@ -25,7 +25,7 @@ @foreach($extensions as $ext) {{ $ext['ext'] }} - + @if($ext['passed'] === true) OK @else @@ -44,7 +44,7 @@ @foreach($directories as $dir) {{ $dir['dir'] }} - + @if($dir['passed'] === true) OK @else diff --git a/modules/Installer/Resources/views/install/steps/step2-db.blade.php b/modules/Installer/Resources/views/install/steps/step2-db.blade.php index ac0a17de..ea7bf08c 100644 --- a/modules/Installer/Resources/views/install/steps/step2-db.blade.php +++ b/modules/Installer/Resources/views/install/steps/step2-db.blade.php @@ -32,7 +32,7 @@ -

Select Database Type

+

Database Type

{{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }} diff --git a/resources/docker/php/Dockerfile b/resources/docker/php/Dockerfile index 6745c308..7fa5d10e 100644 --- a/resources/docker/php/Dockerfile +++ b/resources/docker/php/Dockerfile @@ -8,6 +8,7 @@ COPY ext-opcache.ini $PHP_INI_DIR/conf.d/ RUN ln -sf /dev/stderr /var/log/fpm-error.log RUN docker-php-ext-install \ + bcmath \ calendar \ pdo_mysql \ gmp \ diff --git a/resources/sass/now-ui/now-ui-kit/_sections.scss b/resources/sass/now-ui/now-ui-kit/_sections.scss index 9465b192..6f9e87ac 100755 --- a/resources/sass/now-ui/now-ui-kit/_sections.scss +++ b/resources/sass/now-ui/now-ui-kit/_sections.scss @@ -111,6 +111,10 @@ &[filter-color="orange"]{ @include linear-gradient(rgba($black-color,.20), rgba(224, 23, 3, 0.6)); } + + &[filter-color="blue"]{ + @include linear-gradient(rgba(6, 126, 193,.20), rgba(6, 126, 193, 0.6)); + } } .section-story-overview{