Merge pull request #66 from andreapollastri/develop

Updates

app/Http/Controllers/ServersController.php

@@ -60,6 +60,22 @@ class ServersController extends Controller
     }
 
 
+    public function changeip(Request $request)
+    {
+
+        $this->validate($request, [
+            'servercode' => 'required',
+            'ip'         => 'required'
+        ]);
+
+        $server = Server::where('servercode', $request->servercode)->get()->first();
+        $server->ip = $request->input('ip');
+        $server->save();
+
+        return redirect()->route('servers');
+
+    }
+
 
     public function delete(Request $request)
     {

resources/views/applications.blade.php

@@ -16,6 +16,7 @@
                         <th class="text-center">{{ __('User') }}</th>
                         <th class="text-center d-none d-lg-table-cell">{{ __('Server') }}</th>
                         <th class="text-center d-none d-lg-table-cell">{{ __('IP') }}</th>
+                        <th class="text-center d-none d-lg-table-cell">{{ __('Type') }}</th>
                         <th class="text-center">{{ __('Actions') }}</th>
                     </tr>
                 </thead>
@@ -27,6 +28,24 @@
                         <td class="text-center">{{ $application->username }}</td>
                         <td class="text-center d-none d-lg-table-cell">{{ $application->server->name }}</td>
                         <td class="text-center d-none d-lg-table-cell">{{ $application->server->ip }}</td>
+                        <td class="text-center d-none d-lg-table-cell">
+                            @switch($application->autoinstall)
+                                @case('wordpress')
+                                    <i class="fab fa-wordpress"></i>
+                                    @break
+                                @case('laravel')
+                                    <i class="fab fa-laravel"></i>
+                                    @break
+                                @case('git')
+                                    <i class="fab fa-github-alt"></i>
+                                    @break
+                                @case('none')
+                                    <i class="fab fa-php"></i>
+                                    @break
+                                @default
+
+                            @endswitch
+                        </td>
                         <td class="text-center">
                         <i class="fab fa-expeditedssl ssl-click" style="margin-right: 18px; cursor: pointer; color: gray;" data-application="{{ $application->appcode }}" id="ssl-{{ $application->appcode }}"></i>
                     	<i class="fas fa-trash-alt" data-toggle="modal" data-target="#deleteModal" class="fas fa-trash-alt" data-app-code="{{ $application->appcode }}" data-app-domain="{{ $application->domain }}" style="color:gray; cursor: pointer;"></i>

resources/views/servers.blade.php

@@ -4,7 +4,7 @@
 <!-- Page Heading -->
 <div class="d-sm-flex align-items-center justify-content-between mb-4">
     <h1 class="h3 mb-0 text-gray-800">{{ __('Servers') }}</h1>
-    <a href="#" class="btn btn-sm btn-secondary shadow-sm " data-toggle="modal" data-target="#createModal" ><i class="fas fa-plus"></i><span class="d-none d-md-inline"> {{ __('CREATE NEW') }}</span></a>   
+    <a href="#" class="btn btn-sm btn-secondary shadow-sm " data-toggle="modal" data-target="#createModal" ><i class="fas fa-plus"></i><span class="d-none d-md-inline"> {{ __('CREATE NEW') }}</span></a>
 </div>
 <div class="card shadow mb-4">
     <div class="card-body">
@@ -31,11 +31,14 @@
                                     {{ $server->name }}
                                 @endif
                             </td>
-                            <td class="text-center">{{ $server->ip }}</td>
+                            <td class="text-center">
+                                {{ $server->ip }}
+                                <i data-toggle="modal" data-target="#changeipModal" class="far fa-edit" data-servercode="{{ $server->servercode }}" data-serverip="{{ $server->ip }}" style="color:gray; cursor: pointer;"></i>
+                            </td>
                             <td class="text-center d-none d-lg-table-cell">{{ $server->provider }}</td>
                             <td class="text-center d-none d-lg-table-cell">{{ $server->location }}</td>
                             <td class="text-center">
-                            <i class="fas fa-trash-alt" data-toggle="modal" data-target="#deleteModal" class="fas fa-trash-alt" data-servercode="{{ $server->servercode }}" data-servername="{{ $server->name }}" style="color:gray; cursor: pointer;"></i>
+                            <i data-toggle="modal" data-target="#deleteModal" class="fas fa-trash-alt" data-servercode="{{ $server->servercode }}" data-servername="{{ $server->name }}" style="color:gray; cursor: pointer;"></i>
                             </td>
                         </tr>
                     @endforeach
@@ -129,6 +132,36 @@
 </div>
 
 
+<!-- CHANGE IP -->
+<div class="modal fade" id="changeipModal" tabindex="-1" role="dialog" aria-labelledby="changeipModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <form action="{{ route('serverchangeip') }}" method="POST">
+                @csrf
+                <input type="hidden" name="servercode" id="server-code" value="">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="changeipModalLabel">{{ __('Update Server IP') }}</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class=" row">
+                        <div class="col-sm-12">
+                            <input type="text" id="server-ip" required class="form-control @error('ip') is-invalid @enderror" name="ip">
+                            <i class="fas fa-exclamation-circle" style="margin-left: 5px;"></i> {{ __('Before submit changes, be shure about your new IP!') }}
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ __('Close') }}</button>
+                    <button type="submit" class="btn btn-primary">{{ __('Update') }}</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
 <!-- DELETE -->
 <div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel" aria-hidden="true">
     <div class="modal-dialog" role="document">
@@ -195,5 +228,13 @@ $('#deleteModal').on('show.bs.modal', function (event) {
     modal.find('#server-code').val(servercode)
     modal.find('#server-name').text(servername)
 })
+$('#changeipModal').on('show.bs.modal', function (event) {
+    var button = $(event.relatedTarget)
+    var servercode = button.data('servercode')
+    var serverip = button.data('serverip')
+    var modal = $(this)
+    modal.find('#server-code').val(servercode)
+    modal.find('#server-ip').val(serverip)
+})
 </script>
 @endsection

routes/web.php

@@ -38,6 +38,7 @@ Route::get('/ajaxapplications/{server}','ApisController@ajaxapplications')->name
 Route::get('/servers','ServersController@index')->name('servers');
 Route::post('/servers/create/','ServersController@create')->name('servercreate');
 Route::post('/servers/delete/','ServersController@delete')->name('serverdelete');
+Route::post('/servers/changeip/','ServersController@changeip')->name('serverchangeip');
 
 Route::get('/scripts/install/{servercode}','ScriptsController@install')->name('serverinstall');
 Route::get('/scripts/hostadd/{servercode}','ScriptsController@hostadd');