Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove laravelcollective/html from installer, updater and importer #1807

Merged
merged 7 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions resources/views/system/importer/complete.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@
@section('title', 'Import Completed!')

@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'importer.complete', 'method' => 'GET']) }}
<div style="align-content: center;">
<form method="get" action="{{ route('importer.complete') }}">
@csrf
<h4>Installer Completed!</h4>

<h4>Installer Completed!</h4>
<p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
<p>Click the button to proceed to the login screen!</p>

<p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
<p>Click the button to proceed to the login screen!</p>

<p style="text-align: right">
{{ Form::submit('Import Complete! Continue to Log-In >>',
['class' => 'btn btn-success'])
}}
</p>
{{ Form::close() }}
</div>
<p style="text-align: right">
<button type="submit" class="btn btn-success">Import Complete! Continue to Log-In >></button>
</p>
</form>
</div>
@endsection
21 changes: 11 additions & 10 deletions resources/views/system/importer/step1-configure.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'importer.config', 'method' => 'POST']) }}
<form method="post" action="{{ route('importer.config') }}">
@csrf
<table class="table">
<tr>
<td colspan="2">
Expand Down Expand Up @@ -34,7 +35,7 @@
<td>Database Host</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
<input type="text" name="db_host" value="127.0.0.1" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -43,7 +44,7 @@
<td>Database Port</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
<input type="text" name="db_port" value="3306" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -52,7 +53,7 @@
<td>Database Name</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
<input type="text" name="db_name" value="phpvms" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -61,7 +62,7 @@
<td>Database User</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
<input type="text" name="db_user" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -70,14 +71,14 @@
<td>Database Password</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
<input type="text" name="db_pass" class="form-control" />
</div>
</td>
</tr>

<tr>
<td colspan="2" style="text-align: right;">
{{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
<button type="button" class="btn btn-info" id="dbtest_button">Test Database Credentials</button>
ArthurHetem marked this conversation as resolved.
Show resolved Hide resolved
</td>
</tr>
</tbody>
Expand All @@ -86,7 +87,7 @@
<td>Database Prefix</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_prefix', 'phpvms_', ['class' => 'form-control']) }}
<input type="text" name="db_prefix" value="phpvms_" class="form-control" />
<p>Prefix of the tables, if you're using one</p>
</div>
</td>
Expand All @@ -95,9 +96,9 @@
</table>
<div id="dbtest"></div>
<p style="text-align: right">
{{ Form::submit('Start Importer >>', ['class' => 'btn btn-success']) }}
<button type="submit" class="btn btn-success">Start Importer >></button>
</p>
{{ Form::close() }}
</form>
</div>
@endsection

Expand Down
10 changes: 4 additions & 6 deletions resources/views/system/importer/step2-processing.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'importer.complete', 'method' => 'POST']) }}
<form method="post" action="{{ route('importer.complete') }}">
@csrf
<table class="table" width="25%">

<tr>
Expand All @@ -24,12 +25,9 @@

</table>
<p style="text-align: right">
{{ Form::submit('Complete Import', [
'id' => 'completebutton',
'class' => 'btn btn-success'
]) }}
<button type="submit" class="btn btn-success" id="completebutton">Complete Import</button>
</p>
{{ Form::close() }}
</form>
</div>
@endsection

Expand Down
11 changes: 6 additions & 5 deletions resources/views/system/installer/install/index-start.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@

@section('content')
<h3 class="text-center">Click on <b>Start</b> to Continue</h3>
{{ Form::open(['route' => 'installer.step1post', 'method' => 'post']) }}
<p style="text-align: right">
{{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
</p>
{{ Form::close() }}
<form method="post" action="{{ route('installer.step1post') }}">
@csrf
<p style="text-align: right">
<button type="submit" class="btn btn-success">Start >></button>
</p>
</form>
@endsection
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }}
<form method="get" action="{{ route('installer.step2') }}">
@csrf
<table class="table" width="25%">
<tr>
<td colspan="2"><h4>php version</h4></td>
Expand Down Expand Up @@ -56,9 +57,9 @@
</table>
@if($passed === true)
<p style="text-align: right">
{{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
<button type="submit" class="btn btn-success">Database Setup >></button>
</p>
@endif
{{ Form::close() }}
</form>
</div>
@endsection
31 changes: 18 additions & 13 deletions resources/views/system/installer/install/steps/step2-db.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
@section('title', 'Database Setup')
@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }}
<form method="post" action="{{ route('installer.envsetup') }}">
@csrf
<table class="table" width="25%">

<tr>
Expand All @@ -13,7 +14,7 @@
<td>Site Name</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
<input type="text" name="site_name" value="phpvms" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -22,7 +23,7 @@
<td>Site URL</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'app_url', Request::root(), ['class' => 'form-control']) }}
<input type="text" name="app_url" value="{{ Request::root() }}" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -38,7 +39,11 @@
<td><p>Database Type</p></td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
<select name="db_conn" id="db_conn" class="form-control" id="db_conn">
@foreach ($db_types as $db_type)
<option value="{{ $db_type }}">{{ $db_type }}</option>
@endforeach
</select>
</div>
</td>
</tr>
Expand All @@ -48,7 +53,7 @@
<td>Database Host</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
<input type="text" name="db_host" value="127.0.0.1" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -57,7 +62,7 @@
<td>Database Port</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
<input type="text" name="db_port" value="3306" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -66,7 +71,7 @@
<td>Database Name</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
<input type="text" name="db_name" value="phpvms" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -75,7 +80,7 @@
<td>Database User</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
<input type="text" name="db_user" class="form-control" />
</div>
</td>
</tr>
Expand All @@ -84,14 +89,14 @@
<td>Database Password</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
<input type="password" name="db_pass" class="form-control" />
</div>
</td>
</tr>

<tr>
<td colspan="2" style="text-align: right;">
{{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
<button type="button" class="btn btn-info" id="dbtest_button">Test Database Credentials</button>
ArthurHetem marked this conversation as resolved.
Show resolved Hide resolved
</td>
</tr>
</tbody>
Expand All @@ -104,7 +109,7 @@
<td>Database Prefix</td>
<td style="text-align:center;">
<div class="form-group">
{{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }}
<input type="text" name="db_prefix" class="form-control" />
<p>Set this if you're sharing the database with another application.</p>
</div>
</td>
Expand All @@ -113,9 +118,9 @@
</table>
<div id="dbtest"></div>
<p style="text-align: right">
{{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
<button type="submit" class="btn btn-success">Setup Database >></button>
</p>
{{ Form::close() }}
</form>
</div>
@endsection

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
@section('title', 'Database Setup Completed')
@section('content')
<div style="align-content: center;">
{{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }}
<form method="get" action="{{ route('installer.step3') }}">
@csrf

<pre class="lang-sh">
<code class="lang-sh">
Expand All @@ -12,8 +13,8 @@
</pre>

<p style="text-align: right">
{{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
<button type="submit" class="btn btn-success">Continue >></button>
</p>
{{ Form::close() }}
</form>
</div>
@endsection
Loading
Loading