From 055a6539e144a2038ddafdca1882f6a08cac8193 Mon Sep 17 00:00:00 2001 From: ghermans Date: Mon, 23 Mar 2020 03:57:35 +0100 Subject: [PATCH] fixed #2525 --- public/installer/CSS/style.css | 398 +++++++++++------- public/installer/EnvConfig.php | 18 +- public/installer/Environment.php | 201 --------- public/installer/Finish.php | 27 -- public/installer/Images/left-side.svg | 23 - public/installer/Images/right-side.svg | 20 - public/installer/JS/script | 90 ---- public/installer/Views/requirements.blade.php | 43 +- public/installer/css/old.css | 258 ++++++++++++ public/installer/index.php | 50 ++- public/installer/js/script.js | 86 ++++ .../{Admin.php => views/admin.blade.php} | 83 ++-- .../{Email.php => views/email.blade.php} | 92 ++-- public/installer/views/environment.blade.php | 247 +++++++++++ public/installer/views/finish.blade.php | 37 ++ .../migration.blade.php} | 164 ++++---- 16 files changed, 1112 insertions(+), 725 deletions(-) delete mode 100755 public/installer/Environment.php delete mode 100755 public/installer/Finish.php delete mode 100755 public/installer/Images/left-side.svg delete mode 100755 public/installer/Images/right-side.svg delete mode 100755 public/installer/JS/script create mode 100644 public/installer/css/old.css create mode 100644 public/installer/js/script.js rename public/installer/{Admin.php => views/admin.blade.php} (63%) mode change 100755 => 100644 rename public/installer/{Email.php => views/email.blade.php} (51%) create mode 100644 public/installer/views/environment.blade.php create mode 100644 public/installer/views/finish.blade.php rename public/installer/{Migration.php => views/migration.blade.php} (62%) mode change 100755 => 100644 diff --git a/public/installer/CSS/style.css b/public/installer/CSS/style.css index b20149138..99d12f2ac 100755 --- a/public/installer/CSS/style.css +++ b/public/installer/CSS/style.css @@ -3,7 +3,6 @@ body { font-size: 16px; font-family: "Montserrat", sans-serif; color: #000311; - text-align: center; background: #fff; position: relative; height: 100%; @@ -13,6 +12,7 @@ a { color: rgb(0, 65, 255); text-decoration: none;} .initial-display{ padding-top: 50px; + text-align: center; } .initial-display .logo { @@ -24,20 +24,17 @@ a { color: rgb(0, 65, 255); text-decoration: none;} color: #333333; text-align: center; font-weight: 600; - margin-top: 30px; + margin-top: 10px; + padding-bottom: 10px; } -.prepare-btn { - box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2), 0 0 8px 0 rgba(0, 0, 0, 0.1); - border-radius: 3px; - border: none; - cursor: pointer; - font: inherit; - display: inline-block; - background: #0041FF; - color: #ffffff; - padding: 10px 20px; - margin-top: 20px; +.card { + border-radius: 5px; + box-shadow: 1px 9px 18px rgba(62, 85, 120, 0.45); +} + +.btn-primary { + background-color: #0041FF; } .warning { @@ -51,38 +48,47 @@ a { color: rgb(0, 65, 255); text-decoration: none;} padding-bottom: 20px; } -.left-patern { - position: absolute; - left: 0; - bottom: 0; +.form-control{ + border: 2px solid #C7C7C7; + border-radius: 3px; + -webkit-transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); + transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); + padding: 0px 10px; + font-size: 15px; + margin-top: 10px; } -.right-patern { - position: absolute; - right: 0; - bottom: 0; +.form-control:focus { + border-color: #0041FF; + box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset, 0px 0px 8px rgba(11, 50, 139, 0.5); } -.content { - 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-y: auto; +.form-group label.required::after { + margin-left: 1px; + content: "*"; + color: #FC6868; + font-weight: 700; + display: inline-block; +} + +.form-error { + color: #ff5656 !important; +} + +.control-group.has-error .control { + border-color: #FC6868 !important; } .requirements_list { width: 90%; list-style: none; - margin-left: 5%; + margin-left: 4%; padding:0; } .requirements_list li { - padding: 0 8px 8px; - margin-bottom: 8px; + padding: 0 10px 10px; + margin-bottom: 10px; border-bottom: 1px dashed #dcdcdc; line-height: normal; } @@ -94,11 +100,51 @@ a { color: rgb(0, 65, 255); text-decoration: none;} color:#9b9b9b; } -.content .cp-round { - position: auto !important; +.title { + font-size: 16px; + color: #151515; + line-height: 30px; + text-align: left; + margin-top: 30px; + margin-bottom: 10px; + text-align: center; } -.content .cp-round:before { +.welcome, .environment, .migration, .permission, .admin, .finish { + display : none; +} + +pre.bash { + background-color: black; + color: white; + font-size: medium ; + font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; + width: 100%; + display: inline-block; + height: 100%; +} + +.check { + line-height: 35px; + margin-left: 25%; +} + +.composer { + position: auto; + top: calc(50% + 24px); + display: none; +} + +.message { + padding-left: 140px; +} + +.cp-round { + position: auto !important; + padding-bottom: 130px; +} + +.cp-round:before { border-radius: 50%; content: " "; width: 48px; @@ -114,7 +160,7 @@ a { color: rgb(0, 65, 255); text-decoration: none;} left: calc(50% - 24px); } -.content .cp-round:after { +.cp-round:after { border-radius: 50%; content: " "; width: 48px; @@ -136,123 +182,179 @@ a { color: rgb(0, 65, 255); text-decoration: none;} 100% { transform: rotate(360deg); } } -.title { - font-size: 16px; - color: #151515; - line-height: 30px; - text-align: left; - margin-top: 30px; - margin-bottom: 10px; - text-align: center; -} - -span { - font-size: 16px; - color: #333333; - line-height: 30px; -} - -.welcome, .environment, .migration, .permission, .admin, .finish { - display : none; -} - -.control-group { - display: block; - margin-bottom: 25px; - font-size: 15px; - color: #333333; - width: 750px; - max-width: 100%; - position: relative; -} - -.control-group label { - display: block; - color: #3a3a3a; -} - -.control-group .control { - background: #fff; - border: 2px solid #C7C7C7; - border-radius: 3px; - width: 100%; - height: 36px; - display: inline-block; - vertical-align: middle; - -webkit-transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); - transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); - padding: 0px 10px; - font-size: 15px; - margin-top: 10px; - margin-bottom: 5px; -} - -.control-group label.required::after { - content: "*"; - color: #FC6868; - font-weight: 700; - display: inline-block; -} - -.form-error { - color: #ff5656 !important; -} - -.control-group.has-error .control { - border-color: #FC6868 !important; -} - -pre.bash { - background-color: black; - color: white; - font-size: medium ; - font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; - width: 100%; - display: inline-block; - height: 100%; -} - -.check { - line-height: 35px; - margin-left: 25%; -} - -.composer { - position: absolute; - top: calc(50% + 24px); - display: none; -} - -.message { - padding-left: 140px; -} - -@media (min-width: 1281px) { - .content { - padding: 2rem 0; - } - - .content { - max-height: 484px; - margin: 20px auto; - } -} - @media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) { .initial-display{ padding-top: 15px; } - .content { - padding: 1rem 0; - } - - .content { - max-height: 488px; - margin: 30px auto; - } - .initial-display p { margin-top: 4px; } -} \ No newline at end of file +} + +/* Select */ + +.select2-container--bootstrap4 .select2-selection--single { + height: calc(2.25rem + 2px) !important; } + .select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder { + color: #757575; + line-height: 2.25rem; } + .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow { + position: absolute; + top: 50%; + right: 3px; + width: 20px; } + .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b { + top: 60%; + border-color: #343a40 transparent transparent transparent; + border-style: solid; + border-width: 5px 4px 0 4px; + width: 0; + height: 0; + left: 50%; + margin-left: -4px; + margin-top: -2px; + position: absolute; } + .select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered { + line-height: 2.25rem; } + + .select2-search--dropdown .select2-search__field { + border: 1px solid #ced4da; + border-radius: 0.25rem; } + + .select2-results__message { + color: #6c757d; } + + .select2-container--bootstrap4 .select2-selection--multiple { + min-height: calc(2.25rem + 2px) !important; } + .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered { + -webkit-box-sizing: border-box; + box-sizing: border-box; + list-style: none; + margin: 0; + padding: 0 5px; + width: 100%; } + .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice { + color: #343a40; + border: 1px solid #bdc6d0; + border-radius: 0.2rem; + padding: 0; + padding-right: 5px; + cursor: pointer; + float: left; + margin-top: 0.3em; + margin-right: 5px; } + .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove { + color: #bdc6d0; + font-weight: bold; + margin-left: 3px; + margin-right: 1px; + padding-right: 3px; + padding-left: 3px; + float: left; } + .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover { + color: #343a40; } + + .select2-container { + display: block; } + .select2-container *:focus { + outline: 0; } + + .input-group .select2-container--bootstrap4 { + -webkit-box-flex: 1; + -ms-flex-positive: 1; + flex-grow: 1; } + + .input-group-prepend ~ .select2-container--bootstrap4 .select2-selection { + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + + .input-group > .select2-container--bootstrap4:not(:last-child) .select2-selection { + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + + .select2-container--bootstrap4 .select2-selection { + background-color: #fff; + border: 1px solid #ced4da; + border-radius: 0.25rem; + -webkit-transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; + transition: border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out; + width: 100%; } + @media screen and (prefers-reduced-motion: reduce) { + .select2-container--bootstrap4 .select2-selection { + -webkit-transition: none; + transition: none; } } + + .select2-container--bootstrap4.select2-container--focus .select2-selection { + border-color: #0041FF; + -webkit-box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); } + + .select2-container--bootstrap4.select2-container--focus.select2-container--open .select2-selection { + border-bottom: none; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } + + .select2-container--bootstrap4.select2-container--disabled .select2-selection, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-selection { + background-color: #e9ecef; + cursor: not-allowed; + border-color: #ced4da; + -webkit-box-shadow: none; + box-shadow: none; } + + .select2-container--bootstrap4.select2-container--disabled .select2-search__field, .select2-container--bootstrap4.select2-container--disabled.select2-container--focus .select2-search__field { + background-color: transparent; } + + select.is-invalid ~ .select2-container--bootstrap4 .select2-selection, + form.was-validated select:invalid ~ .select2-container--bootstrap4 .select2-selection { + border-color: #dc3545; } + + select.is-valid ~ .select2-container--bootstrap4 .select2-selection, + form.was-validated select:valid ~ .select2-container--bootstrap4 .select2-selection { + border-color: #28a745; } + + .select2-container--bootstrap4 .select2-dropdown { + border-color: #ced4da; + border-top: none; + border-top-left-radius: 0; + border-top-right-radius: 0; } + .select2-container--bootstrap4 .select2-dropdown.select2-dropdown--above { + border-top: 1px solid #ced4da; + border-top-left-radius: 0.25rem; + border-top-right-radius: 0.25rem; } + .select2-container--bootstrap4 .select2-dropdown .select2-results__option[aria-selected=true] { + background-color: #e9ecef; } + + .select2-container--bootstrap4 .select2-results__option--highlighted, + .select2-container--bootstrap4 .select2-results__option--highlighted.select2-results__option[aria-selected=true] { + background-color: #0041FF; + color: #f8f9fa; } + + .select2-container--bootstrap4 .select2-results__option[role=group] { + padding: 0; } + + .select2-container--bootstrap4 .select2-results > .select2-results__options { + max-height: 15em; + overflow-y: auto; } + + .select2-container--bootstrap4 .select2-results__group { + padding: 6px; + display: list-item; + color: #6c757d; } + + .select2-container--bootstrap4 .select2-selection__clear { + width: 1.2em; + height: 1.2em; + line-height: 1.15em; + padding-left: 0.3em; + margin-top: 0.5em; + border-radius: 100%; + background-color: #6c757d; + color: #f8f9fa; + float: right; + margin-right: 0.3em; } + .select2-container--bootstrap4 .select2-selection__clear:hover { + background-color: #343a40; } + \ No newline at end of file diff --git a/public/installer/EnvConfig.php b/public/installer/EnvConfig.php index f68ca88ab..6d1223693 100755 --- a/public/installer/EnvConfig.php +++ b/public/installer/EnvConfig.php @@ -9,11 +9,20 @@ $data = array(); // validate the variables // if any of these variables don't exist, add an error to our $errors array + if (empty($_POST['app_name'])) + $errors['app_name'] = 'App Name is required.'; + if (empty($_POST['app_url'])) $errors['app_url'] = 'App Url is required.'; - if (empty($_POST['app_name'])) - $errors['app_name'] = 'App Name is required.'; + if (empty($_POST['app_currency'])) + $errors['app_currency'] = 'The application currency is required.'; + + if (empty($_POST['app_locale'])) + $errors['app_locale'] = 'Please select a locale for the application.'; + + if (empty($_POST['app_timezone'])) + $errors['app_timezone'] = 'The application timezone is required.'; if (empty($_POST['host_name'])) $errors['host_name'] = 'Host Name is required.'; @@ -51,7 +60,7 @@ $data = array(); //return a response // if there are any errors in our errors array, return a success boolean of false - if ( ! empty($errors)) { + if (! empty($errors)) { // if there are items in our errors array, return those errors $data['success'] = false; @@ -101,6 +110,9 @@ $data = array(); $keyValueData['DB_PASSWORD'] = $_POST["user_password"]; $keyValueData['APP_NAME'] = $_POST["app_name"]; $keyValueData['APP_URL'] = $_POST["app_url"]; + $keyValueData['APP_CURRENCY'] = $_POST["app_currency"]; + $keyValueData['APP_LOCALE'] = $_POST["app_locale"]; + $keyValueData['APP_TIMEZONE'] = $_POST["app_timezone"]; $keyValueData['DB_CONNECTION'] = $_POST["database_connection"]; $keyValueData['DB_PORT'] = $_POST["port_name"]; diff --git a/public/installer/Environment.php b/public/installer/Environment.php deleted file mode 100755 index 78fd3b970..000000000 --- a/public/installer/Environment.php +++ /dev/null @@ -1,201 +0,0 @@ - - - - -
-
-

Environment Configuration

- -
-
-
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
-
-
-
- -
- back -
-
-
- -
-
- - - - - - - - - diff --git a/public/installer/Finish.php b/public/installer/Finish.php deleted file mode 100755 index e8e00aaaf..000000000 --- a/public/installer/Finish.php +++ /dev/null @@ -1,27 +0,0 @@ - - -
-
-

Installation completed

-
-
- - Bagisto is successfully installed on your system.
- Click the below button to launch the admin panel. - -
-
- - -
-
- - - - diff --git a/public/installer/Images/left-side.svg b/public/installer/Images/left-side.svg deleted file mode 100755 index 891572fc3..000000000 --- a/public/installer/Images/left-side.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - feature-bg-2 copy - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/installer/Images/right-side.svg b/public/installer/Images/right-side.svg deleted file mode 100755 index a45fd2f75..000000000 --- a/public/installer/Images/right-side.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - feature-bg-2 - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/installer/JS/script b/public/installer/JS/script deleted file mode 100755 index e5535082a..000000000 --- a/public/installer/JS/script +++ /dev/null @@ -1,90 +0,0 @@ - \ No newline at end of file diff --git a/public/installer/Views/requirements.blade.php b/public/installer/Views/requirements.blade.php index be58eaedc..ceb405a9f 100755 --- a/public/installer/Views/requirements.blade.php +++ b/public/installer/Views/requirements.blade.php @@ -1,18 +1,18 @@ - + - +
+

Server Requirements

+
- $greenCheck = $actual_link .'/'. 'Images/green-check.svg'; - $redCheck = $actual_link .'/'. 'Images/red-check.svg'; - ?> - - - -
-
-

Server Requirements

-
+
+
+
+
  • @@ -53,15 +53,14 @@
+ + +
+ +
+
- - -
- -
- -
- - +
+
\ No newline at end of file diff --git a/public/installer/css/old.css b/public/installer/css/old.css new file mode 100644 index 000000000..f6db2194e --- /dev/null +++ b/public/installer/css/old.css @@ -0,0 +1,258 @@ +body { + margin: 0; + font-size: 16px; + font-family: "Montserrat", sans-serif; + color: #000311; + text-align: center; + background: #fff; + position: relative; + height: 100%; +} + +a { color: rgb(0, 65, 255); text-decoration: none;} + +.initial-display{ + padding-top: 50px; +} + +.initial-display .logo { + width: 150px; +} + +.initial-display p { + font-size: 24px; + color: #333333; + text-align: center; + font-weight: 600; + margin-top: 25px; +} + +.prepare-btn { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2), 0 0 8px 0 rgba(0, 0, 0, 0.1); + border-radius: 3px; + border: none; + cursor: pointer; + font: inherit; + display: inline-block; + background: #0041FF; + color: #ffffff; + padding: 10px 20px; + margin-top: 20px; +} + +.warning { + margin-left: 15%; +} + +.footer { + bottom: 0; + position: absolute; + width: 100%; + padding-bottom: 20px; +} + +.left-patern { + position: absolute; + left: 0; + bottom: 0; +} + +.right-patern { + position: absolute; + right: 0; + bottom: 0; +} + +.content { + 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-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 { + font-size: 16px; + color: #151515; + line-height: 30px; + text-align: left; + margin-top: 30px; + margin-bottom: 10px; + text-align: center; +} + +span { + font-size: 16px; + color: #333333; + line-height: 30px; +} + +.welcome, .environment, .migration, .permission, .admin, .finish { + display : none; +} + +.control-group { + display: block; + margin-bottom: 15px; + font-size: 15px; + color: #333333; + width: 750px; + max-width: 100%; + position: relative; +} + +.control-group label { + display: block; + color: #3a3a3a; +} + +.control-group .control { + background: #fff; + border: 2px solid #C7C7C7; + border-radius: 3px; + width: 100%; + height: 36px; + display: inline-block; + vertical-align: middle; + -webkit-transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); + transition: 0.2s cubic-bezier(0.4, 0, 0.2, 1); + padding: 0px 10px; + font-size: 15px; + margin-top: 10px; + margin-bottom: 5px; +} + +.control-group label.required::after { + content: "*"; + color: #FC6868; + font-weight: 700; + display: inline-block; +} + +.form-error { + color: #ff5656 !important; +} + +.control-group.has-error .control { + border-color: #FC6868 !important; +} + +pre.bash { + background-color: black; + color: white; + font-size: medium ; + font-family: Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace; + width: 100%; + display: inline-block; + height: 100%; +} + +.check { + line-height: 35px; + margin-left: 25%; +} + +.composer { + position: absolute; + top: calc(50% + 24px); + display: none; +} + +.message { + padding-left: 140px; +} + +@media (min-width: 1281px) { + .content { + padding: 2rem 0; + } + + .content { + max-height: 484px; + margin: 20px auto; + } +} + +@media (min-width: 768px) and (max-width: 1024px) and (orientation: landscape) { + .initial-display{ + padding-top: 15px; + } + + .content { + padding: 1rem 0; + } + + .content { + max-height: 488px; + margin: 30px auto; + } + + .initial-display p { + margin-top: 4px; + } +} \ No newline at end of file diff --git a/public/installer/index.php b/public/installer/index.php index bf0893868..f436816d1 100755 --- a/public/installer/index.php +++ b/public/installer/index.php @@ -1,13 +1,11 @@ + + - - @@ -16,11 +14,19 @@ - - - + + + + + + + + + + + @@ -109,14 +115,11 @@ include __DIR__ . '/Classes/Requirement.php'; // including php files - include __DIR__ . '/Environment.php'; - include __DIR__ . '/Migration.php'; - include __DIR__ . '/Admin.php'; - include __DIR__ . '/Email.php'; - include __DIR__ . '/Finish.php'; - - // including js - include __DIR__ . '/JS/script'; + include __DIR__ . '/views/environment.blade.php'; + include __DIR__ . '/views/migration.blade.php'; + include __DIR__ . '/views/admin.blade.php'; + include __DIR__ . '/views/email.blade.php'; + include __DIR__ . '/views/finish.blade.php'; // object creation $requirement = new Requirement(); @@ -136,9 +139,10 @@ } ?> -
- Powered by Bagisto, a community project by - Webkul +
+ Bagisto a community project by Webkul
+ + diff --git a/public/installer/js/script.js b/public/installer/js/script.js new file mode 100644 index 000000000..80d728e10 --- /dev/null +++ b/public/installer/js/script.js @@ -0,0 +1,86 @@ +window.onload = function() { + + var welcome = document.getElementById('welcome'); + var requirement = document.getElementById('requirement'); + var permission = document.getElementById('permission'); + var environment = document.getElementById('environment'); + var migration = document.getElementById('migration'); + var admin = document.getElementById('admin'); + + var welcomeCheck = document.getElementById('welcome-check'); + var requirementCheck = document.getElementById('requirement-check'); + var requirementsRefresh = document.getElementById('requirements-refresh'); + + var permisssionCheck = document.getElementById('permission-check'); + var environmentCheck = document.getElementById('environment-check'); + var continue_to_admin = document.getElementById('continue'); + + var permissionBack = document.getElementById('permission-back'); + var requirementBack = document.getElementById('requirement-back'); + var envBack = document.getElementById('envronment-back'); + var migrationBack = document.getElementById('migration-back'); + + if (requirementCheck) { + requirementCheck.addEventListener('click', myFunction); + } + + if (requirementsRefresh) { + requirementsRefresh.addEventListener('click', myFunction); + } + + if (welcomeCheck) { + welcomeCheck.addEventListener('click', myFunction); + } + + if (permisssionCheck) { + permisssionCheck.addEventListener('click', myFunction); + } + + if (environmentCheck) { + environmentCheck.addEventListener('click', myFunction); + } + + if (continue_to_admin) { + continue_to_admin.addEventListener('click', myFunction); + } + + if (envBack) { + envBack.addEventListener('click', myFunction); + } + + if (requirementBack) { + requirementBack.addEventListener('click', myFunction); + } + + if (permissionBack) { + permissionBack.addEventListener('click', myFunction); + } + + if (migrationBack) { + migrationBack.addEventListener('click', myFunction); + } + + function myFunction() { + if(this.id == 'welcome-check') { + requirement.style.display = "block"; + welcome.style.display = "none"; + } else if (this.id == 'requirement-check') { + environment.style.display = "block"; + requirement.style.display = "none"; + } else if (this.id == 'continue') { + migration.style.display = "none"; + admin.style.display ="block"; + } else if (this.id == 'requirement-back') { + welcome.style.display = "block"; + requirement.style.display = "none"; + } else if (this.id == 'envronment-back') { + environment.style.display ="none"; + requirement.style.display = "block"; + } else if (this.id == 'migration-back') { + migration.style.display = "none"; + environment.style.display ="block"; + } else if (this.id == 'requirements-refresh') { + location.reload(); + } + } +}; \ No newline at end of file diff --git a/public/installer/Admin.php b/public/installer/views/admin.blade.php old mode 100755 new mode 100644 similarity index 63% rename from public/installer/Admin.php rename to public/installer/views/admin.blade.php index 16b6a197c..736c28658 --- a/public/installer/Admin.php +++ b/public/installer/views/admin.blade.php @@ -1,60 +1,49 @@ - +
+
+

Create a Administrator

+
- - -
-
-

Admin Details

- -
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
+
+
+
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
-
-
- -
- +
+ +
+ +
- - - - - - +
+
\ No newline at end of file diff --git a/public/installer/views/finish.blade.php b/public/installer/views/finish.blade.php new file mode 100644 index 000000000..513dba465 --- /dev/null +++ b/public/installer/views/finish.blade.php @@ -0,0 +1,37 @@ +
+
+

Installation completed

+
+ +
+
+
+
+
+ Bagisto is successfully installed on your system.
+
+
+
+ +
 
+
+ + Bagisto Extensions + Bagisto Forums +
+
+
+
+ + \ No newline at end of file diff --git a/public/installer/Migration.php b/public/installer/views/migration.blade.php old mode 100755 new mode 100644 similarity index 62% rename from public/installer/Migration.php rename to public/installer/views/migration.blade.php index 313b4bd8a..a58d13078 --- a/public/installer/Migration.php +++ b/public/installer/views/migration.blade.php @@ -1,40 +1,40 @@ - + - +
+
+

Database Configuration

+
- - -
-
-

Migration & Seed

- -
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+ + +
+
- Click the below button to run following : +

Click the button below to run following :

+
- Database Migration + Create the database tables
+
- Database Seeder + Populate the database tables
+
Publishing Vendor
-
- Generating Application Key +
+ + +
+
+

Checking Composer Dependency

+

Migrating Database

+

Seeding Data

- Checking Composer Dependency - Migrating Database - Seeding Data +
 
+ +
+
+ + +
+ +
+ back +
+
- -
-
- - -
-
- back -
-
-
+
+
- - -