Merge pull request #89 from limanmys/1.3-dev

Yardimci Komutlar

package.json

@@ -22,17 +22,17 @@
         ]
     },
     "devDependencies": {
-        "@prettier/plugin-php": "^0.14.0",
-        "laravel-mix": "^4.0.7",
-        "lint-staged": "^10.2.2",
+        "@prettier/plugin-php": "^0.14.3",
+        "laravel-mix": "^4.1.4",
+        "lint-staged": "^10.3.0",
         "pre-commit": "^1.2.2",
-        "prettier": "^2.0.5",
-        "webpack-cli": "^3.3.7"
+        "prettier": "^2.1.1",
+        "webpack-cli": "^3.3.12"
     },
     "dependencies": {
         "apidoc": "^0.23.0",
         "cross-env": "^5.2.1",
-        "laravel-echo": "^1.6.1",
-        "pusher-js": "^5.0.2"
+        "laravel-echo": "^1.8.1",
+        "pusher-js": "^5.1.1"
     }
 }

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/liman.css": "/css/liman.css?id=defedb66f8a8b13bdeb3",
-    "/js/liman.js": "/js/liman.js?id=f7501181e7a17e8cb884"
+    "/css/liman.css": "/css/liman.css?id=adf3d4942212ac31e4af",
+    "/js/liman.js": "/js/liman.js?id=da1c0edde4a3c1d6a561"
 }

resources/assets/css/liman.css

@@ -48,7 +48,7 @@ table.dataTable tbody tr.selected {
 
 .customAlert {
   border-radius: 0px;
-  text-align: center;
+  text-align: left;
 }
 
 .error-page > .error-content {

resources/views/extension_pages/server.blade.php

@@ -1,27 +1,11 @@
 @extends('layouts.app')
 
 @section('content')
-<ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="{{route('home')}}">{{__("Ana Sayfa")}}</a></li>
-    <li class="breadcrumb-item active"><a href="/l/{{extension()->id}}/{{request('city')}}/{{server()->id}}">{{extension()->display_name . __(" - Ana Sayfa")}}</a></li>
-</ol>
-<div class="right" id="ext_menu" style="float:right;margin-top:-55px">
-        <button data-toggle="tooltip" title="Eklenti Ayarları" class="btn btn-primary" onclick="window.location.href = '{{route('extension_server_settings_page',[
-            "server_id" => server()->id,
-            "extension_id" => extension()->id
-        ])}}'"><i class="fa fa-cogs"></i></button>
-        <button data-toggle="tooltip" title="Sunucuya Git" class="btn btn-primary" onclick="window.location.href = '{{route('server_one',[
-            "server_id" => server()->id,
-        ])}}'"><i class="fa fa-server"></i></button>
-        @if(count($tokens) > 0)
-        <button data-toggle="tooltip" title="Sorgu Oluştur" class="btn btn-primary" onclick="showRequestRecords()"><i class="fa fa-book"></i></button>
-        @endif
-        <button data-toggle="tooltip" title="Destek Al" class="btn btn-primary" onclick="location.href = 'mailto:{{env('APP_NOTIFICATION_EMAIL')}}?subject={{env('BRAND_NAME')}} {{getVersion()}} - {{extension()->display_name}} {{extension()->version}}'"><i class="fas fa-headset"></i></button>
-</div>
+
 @include('errors')    
 
 <div class="card">
-    @if(count($last) > 1)
+    @if(count($last) > 0)
     <div class="card-header">
             <ul id="quickNavBar" class="nav nav-tabs" role="tablist">
 
@@ -51,10 +35,18 @@
                         </li>
 
                     @endif
-                @endforeach
-
-
+                @endforeach 
             </ul>
+            <div class="right" id="ext_menu" style="float:right;margin-top:-40px">
+        <button data-toggle="tooltip" title="Eklenti Ayarları" class="btn btn-primary" onclick="window.location.href = '{{route('extension_server_settings_page',[
+            "server_id" => server()->id,
+            "extension_id" => extension()->id
+        ])}}'"><i class="fa fa-cogs"></i></button>
+        @if(count($tokens) > 0)
+        <button data-toggle="tooltip" title="Sorgu Oluştur" class="btn btn-primary" onclick="showRequestRecords()"><i class="fa fa-book"></i></button>
+        @endif
+        <button data-toggle="tooltip" title="Destek Al" class="btn btn-primary" onclick="location.href = 'mailto:{{env('APP_NOTIFICATION_EMAIL')}}?subject={{env('BRAND_NAME')}} {{getVersion()}} - {{extension()->display_name}} {{extension()->version}}'"><i class="fas fa-headset"></i></button>
+</div>  
     </div>
     @endif
     <div class="card-body">

resources/views/layouts/content.blade.php

@@ -4,7 +4,7 @@
 @endif
     @if(auth()->check() && user()->email == "administrator@liman.dev")
     <div class="alert alert-danger customAlert">
-        <b>{{__("Tam yetkili ana yönetici hesabı ile giriş yaptınız, sisteme zarar verebilirsiniz.")}}</b>
+        {{__("Tam yetkili ana yönetici hesabı ile giriş yaptınız, sisteme zarar verebilirsiniz.")}}
     </div>
     @endif
     <!-- Content Header (Page header) -->

resources/views/layouts/navbar.blade.php

@@ -29,9 +29,15 @@
 	}
 </script>
         </ul>
-
+@if(request('server') != null)
+<ul class="mx-auto order-0 navbar-nav text-white">
+        <li style="font-weight:bolder;font-size:20px;cursor:pointer;" data-toggle="tooltip" data-original-title="{{server()->ip_address}}" onclick="window.location.href = '{{route('server_one',[
+            "server_id" => server()->id,
+        ])}}'">{{server()->name}}</li>
+    </ul>
+@endif
         <!-- Right navbar links -->
-        <ul class="navbar-nav ml-auto">
+        <ul class="navbar-nav @if(request('server') == null) ml-auto @endif">
           <li class="nav-item dropdown">
             <a class="nav-link" data-toggle="dropdown" href="#">
               @if (session('locale') === "tr")

storage/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

storage/build_tools/DEBIAN/postinst

@@ -274,6 +274,13 @@ fi
 sed -i "s/upload_max_filesize.*/upload_max_filesize = 100M/g" /etc/php/7.3/fpm/php.ini
 sed -i "s/post_max_size.*/post_max_size = 100M/g" /etc/php/7.3/fpm/php.ini
 
+#Liman Helper Bash Function
+sed -i '/liman/d' /etc/profile
+echo "function liman(){ sudo runuser liman -c \"php /liman/server/artisan \$1\"; }" | tee --append /etc/profile >/dev/null 2>/dev/null
+sed -i '/liman/d' /root/.profile
+echo "function liman(){ sudo runuser liman -c \"php /liman/server/artisan \$1\"; }" | tee --append /root/.profile >/dev/null 2>/dev/null
+source /etc/profile
+
 # Prepare Folders for vnc
 rm -rf /liman/keys/vnc
 mkdir /liman/keys/vnc
@@ -315,5 +322,5 @@ php /liman/server/artisan optimize:clear
 php /liman/server/artisan up
 
 #Finalize Installation
-printf "\nKurulum Başarıyla Tamamlandı\n\nYönetici Hesabı oluşturmak yada şifrenizi yenilemek için aşağıdaki komutu çalıştırabilisiniz\n\n\n"
-printf "sudo runuser liman -c \"php /liman/server/artisan administrator\"\n\n\n"
+printf "\nKurulum Başarıyla Tamamlandı!\n\nYönetici Hesabı oluşturmak yada şifrenizi yenilemek için aşağıdaki komutu çalıştırabilisiniz\n\n\n"
+printf "source /etc/profile; liman administrator\n\n\nDestek için liman.havelsan.com.tr adresini ziyaret edebilirsiniz.\n"