From ee45ebd6807b7da4f9088eb0f4bff04711da376d Mon Sep 17 00:00:00 2001 From: ghermans Date: Wed, 19 Feb 2020 01:31:23 +0100 Subject: [PATCH] fixed #2163 --- public/installer/CSS/style.css | 142 +++++++++++------- public/installer/Classes/Requirement.php | 2 +- public/installer/Composer.php | 3 +- public/installer/Email.php | 5 +- public/installer/Environment.php | 2 +- public/installer/JS/script | 9 +- public/installer/Migration.php | 4 +- public/installer/MigrationRun.php | 2 +- public/installer/Views/requirements.blade.php | 94 ++++++------ 9 files changed, 148 insertions(+), 115 deletions(-) diff --git a/public/installer/CSS/style.css b/public/installer/CSS/style.css index 3b190391f..b20149138 100755 --- a/public/installer/CSS/style.css +++ b/public/installer/CSS/style.css @@ -9,12 +9,10 @@ body { height: 100%; } -a { - color: rgb(0, 65, 255); - } +a { color: rgb(0, 65, 255); text-decoration: none;} .initial-display{ - padding-top: 30px; + padding-top: 50px; } .initial-display .logo { @@ -26,7 +24,7 @@ a { color: #333333; text-align: center; font-weight: 600; - margin-top: 50px; + margin-top: 30px; } .prepare-btn { @@ -42,6 +40,10 @@ a { margin-top: 20px; } +.warning { + margin-left: 15%; +} + .footer { bottom: 0; position: absolute; @@ -62,12 +64,76 @@ a { } .content { - border-radius: 3px; - box-shadow: 0 10px 40px rgba(62, 85, 120, 0.45); - width: 650px; + border-radius: 5px; + box-shadow: 1px 8px 18px rgba(62, 85, 120, 0.45); + min-height: 300px; + width: 600px; margin-left: calc(50% - 300px); text-align: left; - overflow:auto; + overflow-y: auto; +} + +.requirements_list { + width: 90%; + list-style: none; + margin-left: 5%; + padding:0; +} + +.requirements_list li { + padding: 0 8px 8px; + margin-bottom: 8px; + border-bottom: 1px dashed #dcdcdc; + line-height: normal; +} + +.requirements_list li:last-child { border-bottom: 0;} + +.requirements_list small { + font-size: 13px; + color:#9b9b9b; +} + +.content .cp-round { + position: auto !important; +} + +.content .cp-round:before { + border-radius: 50%; + content: " "; + width: 48px; + height: 48px; + display: inline-block; + box-sizing: border-box; + border-top: solid 6px #bababa; + border-right: solid 6px #bababa; + border-bottom: solid 6px #bababa; + border-left: solid 6px #bababa; + position: absolute; + top: calc(40% - 14px); + left: calc(50% - 24px); +} + +.content .cp-round:after { + border-radius: 50%; + content: " "; + width: 48px; + height: 48px; + display: inline-block; + box-sizing: border-box; + border-top: solid 6px #0041FF; + border-right: solid 6px #bababa; + border-bottom: solid 6px #bababa; + border-left: solid 6px #bababa; + position: absolute; + top: calc(40% - 14px); + left: calc(50% - 24px); + animation: spin 1s ease-in-out infinite; +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } } .title { @@ -92,7 +158,7 @@ span { .control-group { display: block; - margin-bottom: 15px; + margin-bottom: 25px; font-size: 15px; color: #333333; width: 750px; @@ -146,46 +212,9 @@ pre.bash { height: 100%; } -.cp-round:before { - border-radius: 50%; - content: " "; - width: 48px; - height: 48px; - display: inline-block; - box-sizing: border-box; - border-top: solid 6px #bababa; - border-right: solid 6px #bababa; - border-bottom: solid 6px #bababa; - border-left: solid 6px #bababa; - position: absolute; - top: calc(50% - 24px); - left: calc(50% - 24px); -} - .check { line-height: 35px; -} - -.cp-round:after { - border-radius: 50%; - content: " "; - width: 48px; - height: 48px; - display: inline-block; - box-sizing: border-box; - border-top: solid 6px #0041FF; - border-right: solid 6px #bababa; - border-bottom: solid 6px #bababa; - border-left: solid 6px #bababa; - position: absolute; - top: calc(50% - 24px); - left: calc(50% - 24px); - animation: spin 1s ease-in-out infinite; -} - -@keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } + margin-left: 25%; } .composer { @@ -198,19 +227,22 @@ pre.bash { padding-left: 140px; } -@media (max-width: 900px) { +@media (min-width: 1281px) { .content { padding: 2rem 0; } .content { - width: 90%; - height: 350px !important; - margin: 30px auto; + max-height: 484px; + margin: 20px auto; } } -@media (min-width: 720px) { +@media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) { + .initial-display{ + padding-top: 15px; + } + .content { padding: 1rem 0; } @@ -219,4 +251,8 @@ pre.bash { max-height: 488px; margin: 30px auto; } + + .initial-display p { + margin-top: 4px; + } } \ No newline at end of file diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php index 20bd46793..f412ee241 100755 --- a/public/installer/Classes/Requirement.php +++ b/public/installer/Classes/Requirement.php @@ -134,7 +134,7 @@ class Requirement { $data['composer_install'] = 0; } else { $data['composer_install'] = 1; - $data['composer'] = 'Composer dependencies is not Installed.Go to root of project, run "composer install" command to install composer dependencies & refresh page again.'; + $data['composer'] = 'Bagisto has detected that the required composer dependencies are not installed.
Go to the root directory of Bagisto and run "composer install".'; } return $data; diff --git a/public/installer/Composer.php b/public/installer/Composer.php index 35ce0a0a9..05205e11e 100755 --- a/public/installer/Composer.php +++ b/public/installer/Composer.php @@ -1,7 +1,6 @@ @@ -90,12 +89,12 @@ $('#mail_port').addClass('has-error'); $('#mail_port').append('
' + data.errors.mail_port + '
'); } - +/* if (data.errors.mail_encryption) { $('#mail_encryption').addClass('has-error'); $('#mail_encryption').append('
' + data.errors.mail_encryption + '
'); } - +*/ if (data.errors.mail_from) { $('#mail_from').addClass('has-error'); $('#mail_from').append('
' + data.errors.mail_from + '
'); diff --git a/public/installer/Environment.php b/public/installer/Environment.php index 3015b964c..78fd3b970 100755 --- a/public/installer/Environment.php +++ b/public/installer/Environment.php @@ -10,7 +10,7 @@
-
+

Migration & Seed

- -
+
diff --git a/public/installer/MigrationRun.php b/public/installer/MigrationRun.php index fcb9bb1c1..835f7cca9 100755 --- a/public/installer/MigrationRun.php +++ b/public/installer/MigrationRun.php @@ -3,7 +3,7 @@ ini_set('max_execution_time', 300); // array to pass back data -$data = array(); +$data = array(); // run command on terminal $command = 'cd ../.. && php artisan migrate --force'; diff --git a/public/installer/Views/requirements.blade.php b/public/installer/Views/requirements.blade.php index 244a90aeb..5e0a5dfce 100755 --- a/public/installer/Views/requirements.blade.php +++ b/public/installer/Views/requirements.blade.php @@ -11,66 +11,60 @@
-

Requirements

- +

Server Requirements

-
- Please wait while we are checking the server requirements. -
+
    +
  • + + + + PHP + ( or higher) +
    + + + Bagisto has detected that your PHP version () is not supported.
    + Contact your provider if you are not the server administrator. +     + +
    • -
    - -
    - This is just for testing purpose
    it will be removed before pushing to Bagisto's branch. -
    - -
    - - - - PHP - ( or Higher) -
    - - $require): ?> - - $enabled) : ?> -
    - - - - - ( Required) -
    + $require): ?> + $enabled) : ?> +
  • + + + + +
    • + - - -
    - - - Composer - -
    - -
    - - - -
    - +
  • + + + composer + +
    + + + + + +
    • +
-
- -
- +
+ +
- + -