FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Installer fixes, remove bcmath, fix design (#596)

Browse Source 
* Installer cleanup

* Installer design fixes
This commit is contained in:
Nabeel S 2020-02-28 18:00:56 -05:00 committed by GitHub
parent 7e742518bc
commit 2f40f4737c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -12,6 +12,7 @@
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"ext-simplexml": "*", "ext-simplexml": "*",
"ext-bcmath": "*",
"ext-pdo": "*", "ext-pdo": "*",
"composer/composer": "~1.8.0", "composer/composer": "~1.8.0",
"composer/installers": "~1.0", "composer/installers": "~1.0",

2
modules/Installer/Config/config.php
View File

@ -15,7 +15,7 @@ return [
], ],
'extensions' => [ 'extensions' => [
'bcmath', // 'bcmath',
'openssl', 'openssl',
'pdo', 'pdo',
'mbstring', 'mbstring',

2
modules/Installer/Http/Controllers/InstallerController.php
View File

@ -64,7 +64,7 @@ class InstallerController extends Controller
$this->seederSvc = $seederSvc; $this->seederSvc = $seederSvc;
$this->userService = $userService; $this->userService = $userService;
\App\Support\Utils::disableDebugToolbar(); Utils::disableDebugToolbar();
} }
/** /**

47
modules/Installer/Resources/views/app.blade.php
View File

@ -35,9 +35,9 @@
</style> </style>
</head> </head>
<body> <body class="login-page" style="background: #067ec1;">
<!-- Navbar --> <!-- Navbar -->
<nav class="navbar navbar-toggleable-md" style="background: #067ec1;"> {{--<nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
<div class="container" style="width: 85%!important;"> <div class="container" style="width: 85%!important;">
<div class="navbar-translate"> <div class="navbar-translate">
<p class="navbar-brand text-white" data-placement="bottom" target="_blank"> <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
@ -50,20 +50,43 @@
@yield('title') @yield('title')
</div> </div>
</div> </div>
</nav> </nav>--}}
<!-- End Navbar --> <!-- End Navbar -->
{{--<div class="clearfix" style="height: 25px;"></div>--}} <div class="page-header clear-filter">
<div class="wrapper"> {{-- <div class="page-header-image" style="background-image:url({{ public_asset('/assets/installer/bg.jpg') }})"></div>--}}
<div class="clear"></div> <div class="content">
<div class="container" style="width: 50%"> <div class="container">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-md-8 ml-auto mr-auto content-center">
@include('installer::flash.message') <div class="p-10" style="padding: 10px 0;">
@yield('content') <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style="" alt=""/>
</div>
<div class="card card-login card-plain" style="background: #FFF">
<div class="card-header text-center">
<h3 class="card-title title">@yield('title')</h3>
{{--<div class="text-large">
<a href="#" onclick="return false;" class="btn btn-neutral btn-facebook btn-icon btn-round">
<i class="now-ui-icons design_bullet-list-02"></i>
</a>
<a href="#" onclick="return false;" class="btn btn-neutral btn-twitter btn-icon btn-lg btn-round">
<i class="now-ui-icons users_single-02"></i>
</a>
<a href="#" onclick="return false;" class="btn btn-neutral btn-google btn-icon btn-round">
<i class="now-ui-icons users_single-02"></i>
</a>
</div>--}}
</div>
<div class="card-body">
<hr />
@include('installer::flash.message')
@yield('content')
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="clearfix" style="height: 200px;"></div>
</div> </div>
{{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}} {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}

6
modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
View File

@ -10,7 +10,7 @@
</tr> </tr>
<tr> <tr>
<td>PHP Version: {{ $php['version'] }}</td> <td>PHP Version: {{ $php['version'] }}</td>
<td style="text-align:center;"> <td style="text-align:right;">
@if($php['passed'] === true) @if($php['passed'] === true)
<span class="badge badge-success">OK</span> <span class="badge badge-success">OK</span>
@else @else
@ -25,7 +25,7 @@
@foreach($extensions as $ext) @foreach($extensions as $ext)
<tr> <tr>
<td>{{ $ext['ext'] }}</td> <td>{{ $ext['ext'] }}</td>
<td style="text-align:center;"> <td style="text-align:right;">
@if($ext['passed'] === true) @if($ext['passed'] === true)
<span class="badge badge-success">OK</span> <span class="badge badge-success">OK</span>
@else @else
@ -44,7 +44,7 @@
@foreach($directories as $dir) @foreach($directories as $dir)
<tr> <tr>
<td>{{ $dir['dir'] }}</td> <td>{{ $dir['dir'] }}</td>
<td style="text-align:center;"> <td style="text-align:right;">
@if($dir['passed'] === true) @if($dir['passed'] === true)
<span class="badge badge-success">OK</span> <span class="badge badge-success">OK</span>
@else @else

2
modules/Installer/Resources/views/install/steps/step2-db.blade.php
View File

@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td><p>Select Database Type</p></td> <td><p>Database Type</p></td>
<td style="text-align:center;"> <td style="text-align:center;">
<div class="form-group"> <div class="form-group">
{{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }} {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}

1
resources/docker/php/Dockerfile
View File

@ -8,6 +8,7 @@ COPY ext-opcache.ini $PHP_INI_DIR/conf.d/
RUN ln -sf /dev/stderr /var/log/fpm-error.log RUN ln -sf /dev/stderr /var/log/fpm-error.log
RUN docker-php-ext-install \ RUN docker-php-ext-install \
bcmath \
calendar \ calendar \
pdo_mysql \ pdo_mysql \
gmp \ gmp \

4
resources/sass/now-ui/now-ui-kit/_sections.scss
View File

@ -111,6 +111,10 @@
&[filter-color="orange"]{ &[filter-color="orange"]{
@include linear-gradient(rgba($black-color,.20), rgba(224, 23, 3, 0.6)); @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{ .section-story-overview{