Added new widget system

.env

@@ -13,12 +13,12 @@ LOG_ERROR_PATH=/liman/logs/error.log
 
 DB_CONNECTION=sqlite
 DB_PATH=/liman/database/liman.sqlite
-BROADCAST_DRIVER=log
+BROADCAST_DRIVER=pusher
 CACHE_DRIVER=array
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 
-QUEUE_DRIVER=database
+QUEUE_DRIVER=sync
 
 SERVER_CONNECTION_TIMEOUT=5000
 USER_WIDGET_COUNT=10
@@ -32,3 +32,8 @@ EXTENSIONS_PATH=/liman/extensions/
 KEYS_PATH=/liman/keys/
 BRAND_NAME=Havelsan
 LIMAN_CONNECTOR_SERVER=http://127.0.0.1:5000
+
+PUSHER_APP_ID=liman
+PUSHER_APP_KEY=liman-key
+PUSHER_APP_SECRET=liman-secret
+PUSHER_APP_CLUSTER=eu
\ No newline at end of file

app/Notification.php

@@ -4,6 +4,8 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
+use App\Notifications\NotificationSent;
+use App\User;
 
 /**
  * App\Notification
@@ -31,7 +33,9 @@ class Notification extends Model
         $notification->level = $level;
         $notification->read = false;
         $notification->save();
-
+        try {
+            auth()->user()->notify(new NotificationSent($notification));
+        } catch (\Exception $e){}
         // Before we return the notification, check if it's urgent. If so, send an email.
 
 
@@ -49,5 +53,8 @@ class Notification extends Model
         $notification->level = $level;
         $notification->read = false;
         $notification->save();
+        try {
+            User::find($user_id)->notify(new NotificationSent($notification));
+        } catch (\Exception $e){}
     }
 }

app/Notifications/NotificationSent.php

+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\BroadcastMessage;
+
+class NotificationSent extends Notification
+{
+    use Queueable;
+
+    private $notification;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct($notification)
+    {
+        $this->notification = $notification;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['broadcast'];
+    }
+
+    /**
+     * Get the broadcastable representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return BroadcastMessage
+     */
+    public function toBroadcast($notifiable)
+    {
+        return new BroadcastMessage((array) $this->notification);
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return (array) $this->notification;
+    }
+}

app/User.php

@@ -5,6 +5,7 @@ namespace App;
 use App\Server;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 
 /**
  * App\User
@@ -17,7 +18,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
  */
 class User extends Authenticatable
 {
-    use UsesUuid;
+    use UsesUuid, Notifiable;
 
     /**
      * The attributes that are mass assignable.

bootstrap/cache/packages.php

 <?php return array (
+  'beyondcode/laravel-websockets' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'BeyondCode\\LaravelWebSockets\\WebSocketsServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'WebSocketRouter' => 'BeyondCode\\LaravelWebSockets\\Facades\\WebSocketRouter',
+    ),
+  ),
   'facade/ignition' => 
   array (
     'providers' => 

bootstrap/cache/services.php

@@ -23,14 +23,16 @@
     19 => 'Illuminate\\Translation\\TranslationServiceProvider',
     20 => 'Illuminate\\Validation\\ValidationServiceProvider',
     21 => 'Illuminate\\View\\ViewServiceProvider',
-    22 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    23 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    24 => 'Carbon\\Laravel\\ServiceProvider',
-    25 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    26 => 'App\\Providers\\AppServiceProvider',
-    27 => 'App\\Providers\\AuthServiceProvider',
-    28 => 'App\\Providers\\EventServiceProvider',
-    29 => 'App\\Providers\\RouteServiceProvider',
+    22 => 'BeyondCode\\LaravelWebSockets\\WebSocketsServiceProvider',
+    23 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    24 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    25 => 'Carbon\\Laravel\\ServiceProvider',
+    26 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    27 => 'App\\Providers\\AppServiceProvider',
+    28 => 'App\\Providers\\AuthServiceProvider',
+    29 => 'App\\Providers\\BroadcastServiceProvider',
+    30 => 'App\\Providers\\EventServiceProvider',
+    31 => 'App\\Providers\\RouteServiceProvider',
   ),
   'eager' => 
   array (
@@ -44,14 +46,16 @@
     7 => 'Illuminate\\Pagination\\PaginationServiceProvider',
     8 => 'Illuminate\\Session\\SessionServiceProvider',
     9 => 'Illuminate\\View\\ViewServiceProvider',
-    10 => 'Facade\\Ignition\\IgnitionServiceProvider',
-    11 => 'Laravel\\Tinker\\TinkerServiceProvider',
-    12 => 'Carbon\\Laravel\\ServiceProvider',
-    13 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    14 => 'App\\Providers\\AppServiceProvider',
-    15 => 'App\\Providers\\AuthServiceProvider',
-    16 => 'App\\Providers\\EventServiceProvider',
-    17 => 'App\\Providers\\RouteServiceProvider',
+    10 => 'BeyondCode\\LaravelWebSockets\\WebSocketsServiceProvider',
+    11 => 'Facade\\Ignition\\IgnitionServiceProvider',
+    12 => 'Laravel\\Tinker\\TinkerServiceProvider',
+    13 => 'Carbon\\Laravel\\ServiceProvider',
+    14 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    15 => 'App\\Providers\\AppServiceProvider',
+    16 => 'App\\Providers\\AuthServiceProvider',
+    17 => 'App\\Providers\\BroadcastServiceProvider',
+    18 => 'App\\Providers\\EventServiceProvider',
+    19 => 'App\\Providers\\RouteServiceProvider',
   ),
   'deferred' => 
   array (

build_tools/DEBIAN/postinst

@@ -94,6 +94,7 @@ systemctl restart php7.3-fpm
 php /liman/server/artisan migrate --force
 php /liman/server/artisan cache:clear
 php /liman/server/artisan view:clear
+php /liman/server/artisan config:clear
 
 # Clear Sandbox Cache
 rm -rf /tmp/liman
@@ -130,6 +131,30 @@ systemctl daemon-reload
 systemctl enable liman
 systemctl restart liman
 
+# Create Socket Service
+if [ -f "/etc/systemd/system/liman-socket.service" ]; then
+    echo "Liman Socket Service Already Added.";
+else
+        echo """
+[Unit]
+Description=Liman Socket Service
+After=network.target
+StartLimitIntervalSec=0
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+User=liman
+ExecStart=/usr/bin/php /liman/server/artisan websockets:serve --host=127.0.0.1
+
+[Install]
+WantedBy=multi-user.target
+    """ > /etc/systemd/system/liman-socket.service
+fi
+systemctl daemon-reload
+systemctl enable liman-socket
+systemctl restart liman-socket
+
 # Copy Decoder
 cp /liman/server/storage/decoder.so /usr/lib/php/20180731/liman-decoder.so
 chmod 644 /usr/lib/php/20180731/liman-decoder.so

composer.json

@@ -13,11 +13,13 @@
         "ext-ssh2": "*",
         "ext-xml": "*",
         "ext-zip": "*",
+        "beyondcode/laravel-websockets": "^1.3",
         "guzzlehttp/guzzle": "^6.3",
         "icewind/smb": "^3.1",
         "laravel/framework": "^6.3",
         "laravel/helpers": "*",
-        "phpseclib/phpseclib": "^2.0"
+        "phpseclib/phpseclib": "^2.0",
+        "pusher/pusher-php-server": "~3.0"
     },
     "require-dev": {
         "facade/ignition": "^1.4",

config/app.php

@@ -171,7 +171,7 @@ return [
          */
         App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
-        // App\Providers\BroadcastServiceProvider::class,
+        App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         //App\Providers\TelescopeServiceProvider::class,
         App\Providers\RouteServiceProvider::class,

config/broadcasting.php

@@ -38,6 +38,9 @@ return [
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
                 'encrypted' => true,
+                'host' => '127.0.0.1',
+                'port' => 6001,
+                'scheme' => 'http'
             ],
         ],
 

config/queue.php

@@ -35,7 +35,7 @@ return [
         ],
 
         'database' => [
-            'driver' => 'mongodb',
+            'driver' => 'sync',
             'table'  => 'jobs',
             'queue'  => 'default',
             'expire' => 60,

config/websockets.php

+<?php
+
+use BeyondCode\LaravelWebSockets\Dashboard\Http\Middleware\Authorize;
+
+return [
+
+    /*
+     * Set a custom dashboard configuration
+     */
+    'dashboard' => [
+        'port' => env('LARAVEL_WEBSOCKETS_PORT', 6001),
+    ],
+
+    /*
+     * This package comes with multi tenancy out of the box. Here you can
+     * configure the different apps that can use the webSockets server.
+     *
+     * Optionally you specify capacity so you can limit the maximum
+     * concurrent connections for a specific app.
+     *
+     * Optionally you can disable client events so clients cannot send
+     * messages to each other via the webSockets.
+     */
+    'apps' => [
+        [
+            'id' => env('PUSHER_APP_ID'),
+            'name' => env('APP_NAME'),
+            'key' => env('PUSHER_APP_KEY'),
+            'secret' => env('PUSHER_APP_SECRET'),
+            'path' => env('PUSHER_APP_PATH'),
+            'capacity' => null,
+            'enable_client_messages' => true,
+            'enable_statistics' => true,
+        ],
+    ],
+
+    /*
+     * This class is responsible for finding the apps. The default provider
+     * will use the apps defined in this config file.
+     *
+     * You can create a custom provider by implementing the
+     * `AppProvider` interface.
+     */
+    'app_provider' => BeyondCode\LaravelWebSockets\Apps\ConfigAppProvider::class,
+
+    /*
+     * This array contains the hosts of which you want to allow incoming requests.
+     * Leave this empty if you want to accept requests from all hosts.
+     */
+    'allowed_origins' => [
+        //
+    ],
+
+    /*
+     * The maximum request size in kilobytes that is allowed for an incoming WebSocket request.
+     */
+    'max_request_size_in_kb' => 250,
+
+    /*
+     * This path will be used to register the necessary routes for the package.
+     */
+    'path' => 'laravel-websockets',
+
+    /*
+     * Dashboard Routes Middleware
+     *
+     * These middleware will be assigned to every dashboard route, giving you
+     * the chance to add your own middleware to this list or change any of
+     * the existing middleware. Or, you can simply stick with this list.
+     */
+    'middleware' => [
+        'web',
+        Authorize::class,
+    ],
+
+    'statistics' => [
+        /*
+         * This model will be used to store the statistics of the WebSocketsServer.
+         * The only requirement is that the model should extend
+         * `WebSocketsStatisticsEntry` provided by this package.
+         */
+        'model' => \BeyondCode\LaravelWebSockets\Statistics\Models\WebSocketsStatisticsEntry::class,
+
+        /*
+         * Here you can specify the interval in seconds at which statistics should be logged.
+         */
+        'interval_in_seconds' => 60,
+
+        /*
+         * When the clean-command is executed, all recorded statistics older than
+         * the number of days specified here will be deleted.
+         */
+        'delete_statistics_older_than_days' => 60,
+
+        /*
+         * Use an DNS resolver to make the requests to the statistics logger
+         * default is to resolve everything to 127.0.0.1.
+         */
+        'perform_dns_lookup' => false,
+    ],
+
+    /*
+     * Define the optional SSL context for your WebSocket connections.
+     * You can see all available options at: http://php.net/manual/en/context.ssl.php
+     */
+    'ssl' => [
+        /*
+         * Path to local certificate file on filesystem. It must be a PEM encoded file which
+         * contains your certificate and private key. It can optionally contain the
+         * certificate chain of issuers. The private key also may be contained
+         * in a separate file specified by local_pk.
+         */
+        'local_cert' => null,
+
+        /*
+         * Path to local private key file on filesystem in case of separate files for
+         * certificate (local_cert) and private key.
+         */
+        'local_pk' => null,
+
+        /*
+         * Passphrase for your local_cert file.
+         */
+        'passphrase' => null,
+    ],
+
+    /*
+     * Channel Manager
+     * This class handles how channel persistence is handled.
+     * By default, persistence is stored in an array by the running webserver.
+     * The only requirement is that the class should implement
+     * `ChannelManager` interface provided by this package.
+     */
+    'channel_manager' => \BeyondCode\LaravelWebSockets\WebSockets\Channels\ChannelManagers\ArrayChannelManager::class,
+];

database/migrations/2019_10_25_085456_create_websockets_statistics_entries_table.php

+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateWebSocketsStatisticsEntriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::create('websockets_statistics_entries', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('app_id');
+            $table->integer('peak_connection_count');
+            $table->integer('websocket_message_count');
+            $table->integer('api_message_count');
+            $table->nullableTimestamps();
+        });
+    }
+    /**
+     * Reverse the migrations.
+     */
+    public function down()
+    {
+        Schema::dropIfExists('websockets_statistics_entries');
+    }
+}

nginx.conf

+map $http_upgrade $type {
+  default "web";
+  websocket "ws";
+}
+
 server {
     listen 443 ssl http2;
     server_name 0.0.0.0;
@@ -8,9 +13,26 @@ server {
     charset utf-8;
 
     location / {
+      try_files /nonexistent @$type;
+    }
+
+    location @web {
         try_files $uri $uri/ /index.php?$query_string;
     }
 
+    location @ws {
+      proxy_pass             http://127.0.0.1:6001;
+      proxy_read_timeout     60;
+      proxy_connect_timeout  60;
+      proxy_redirect         off;
+
+      # Allow the use of websockets
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection 'upgrade';
+      proxy_set_header Host $host;
+      proxy_cache_bypass $http_upgrade;
+    }
 
     location = /favicon.ico { access_log off; log_not_found off; }
     location = /robots.txt  { access_log off; log_not_found off; }

package.json

@@ -14,6 +14,8 @@
         "webpack-cli": "^3.3.7"
     },
     "dependencies": {
-        "cross-env": "^5.2.1"
+        "cross-env": "^5.2.1",
+        "laravel-echo": "^1.6.1",
+        "pusher-js": "^5.0.2"
     }
 }

public/mix-manifest.json

 {
-    "/css/liman.css": "/css/liman.css?id=638f1b388a235bedf49b",
-    "/js/liman.js": "/js/liman.js?id=b8394e9f53d15dd30919"
+    "/css/liman.css": "/css/liman.css?id=3ea9dafc6b5cd1e7120e",
+    "/js/liman.js": "/js/liman.js?id=db7b57f87c83223245a3"
 }

resources/assets/css/toastr.min.css

+.toast-title{font-weight:700}.toast-message{-ms-word-wrap:break-word;word-wrap:break-word}.toast-message a,.toast-message label{color:#FFF}.toast-message a:hover{color:#CCC;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#FFF;-webkit-text-shadow:0 1px 0 #fff;text-shadow:0 1px 0 #fff;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80);line-height:1}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}.rtl .toast-close-button{left:-.3em;float:left;right:.3em}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-center{top:0;right:0;width:100%}.toast-bottom-center{bottom:0;right:0;width:100%}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999;pointer-events:none}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{position:relative;pointer-events:auto;overflow:hidden;margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;color:#FFF;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80)}#toast-container>div.rtl{direction:rtl;padding:15px 50px 15px 15px;background-position:right 15px center}#toast-container>div:hover{-moz-box-shadow:0 0 12px #000;-webkit-box-shadow:0 0 12px #000;box-shadow:0 0 12px #000;opacity:1;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);filter:alpha(opacity=100);cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=)!important}#toast-container.toast-bottom-center>div,#toast-container.toast-top-center>div{width:300px;margin-left:auto;margin-right:auto}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin-left:auto;margin-right:auto}.toast{background-color:#030303}.toast-success{background-color:#51A351}.toast-error{background-color:#BD362F}.toast-info{background-color:#2F96B4}.toast-warning{background-color:#F89406}.toast-progress{position:absolute;left:0;bottom:0;height:4px;background-color:#000;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}#toast-container>div.rtl{padding:15px 50px 15px 15px}}
\ No newline at end of file

resources/assets/js/liman.js

@@ -144,13 +144,13 @@ function search() {
     });
 }
 
-function checkNotifications() {
+function checkNotifications(exclude=null) {
     request('/bildirimler', new FormData(), function (response) {
         let json = JSON.parse(response);
         if(response["admin"] !== ""){
-            renderNotifications(json["message"]["admin"],'admin','adminNotifications');
+            renderNotifications(json["message"]["admin"],'admin','adminNotifications', exclude);
         }
-        renderNotifications(json["message"]["user"],'user','userNotifications');
+        renderNotifications(json["message"]["user"],'user','userNotifications', exclude);
     });
 }
 
@@ -220,7 +220,7 @@ function addToTable(){
     reload();
 }
 
-function renderNotifications(data,type,target){
+function renderNotifications(data,type,target, exclude){
     let element = $("#" + target + " .menu");
     element.html("");
     //Set Count
@@ -229,9 +229,26 @@ function renderNotifications(data,type,target){
         let errors = [
             "error" , "health_problem", "liman_update"
         ];
-        let color = (errors.includes(notification["error"])) ? "#f56954" : "#00a65a";
+        let color = (errors.includes(notification["type"])) ? "#f56954" : "#00a65a";
         element.append("<li><a href='/bildirim/" + notification["id"] + "'>" + 
                 "<span style='color: " + color + ";width: 100%'>"+ notification["title"] + "</span></a></li>");
+        let displayedNots = [];
+        if(localStorage.displayedNots){
+            displayedNots = JSON.parse(localStorage.displayedNots);
+        } 
+        if(notification.id == exclude){
+            return;
+        }
+        if(displayedNots.includes(notification.id)){
+            return;
+        }
+        if(errors.includes(notification.type)){
+            toastr.error(notification.message, notification.title, {timeOut: 5000})
+        }else{
+            toastr.success(notification.message, notification.title, {timeOut: 5000})
+        }
+        displayedNots.push(notification.id);
+        localStorage.displayedNots = JSON.stringify(displayedNots);
     });
 }
 
@@ -249,4 +266,15 @@ function fixer(val){
     if(!val)
         return val;
     return val.replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
\ No newline at end of file
+}
+
+window.Echo = new Echo({
+    broadcaster: 'pusher',
+    key: 'liman-key',
+    wsHost: window.location.hostname,
+    wssPort: 443,
+    disableStats: true,
+    encrypted: true,
+    enabledTransports: ['ws', 'wss'],
+    disabledTransports: ['sockjs', 'xhr_polling', 'xhr_streaming']
+});
\ No newline at end of file

resources/assets/js/toastr.min.js

+!function(e){e(["jquery"],function(e){return function(){function t(e,t,n){return g({type:O.error,iconClass:m().iconClasses.error,message:e,optionsOverride:n,title:t})}function n(t,n){return t||(t=m()),v=e("#"+t.containerId),v.length?v:(n&&(v=d(t)),v)}function o(e,t,n){return g({type:O.info,iconClass:m().iconClasses.info,message:e,optionsOverride:n,title:t})}function s(e){C=e}function i(e,t,n){return g({type:O.success,iconClass:m().iconClasses.success,message:e,optionsOverride:n,title:t})}function a(e,t,n){return g({type:O.warning,iconClass:m().iconClasses.warning,message:e,optionsOverride:n,title:t})}function r(e,t){var o=m();v||n(o),u(e,o,t)||l(o)}function c(t){var o=m();return v||n(o),t&&0===e(":focus",t).length?void h(t):void(v.children().length&&v.remove())}function l(t){for(var n=v.children(),o=n.length-1;o>=0;o--)u(e(n[o]),t)}function u(t,n,o){var s=!(!o||!o.force)&&o.force;return!(!t||!s&&0!==e(":focus",t).length)&&(t[n.hideMethod]({duration:n.hideDuration,easing:n.hideEasing,complete:function(){h(t)}}),!0)}function d(t){return v=e("<div/>").attr("id",t.containerId).addClass(t.positionClass),v.appendTo(e(t.target)),v}function p(){return{tapToDismiss:!0,toastClass:"toast",containerId:"toast-container",debug:!1,showMethod:"fadeIn",showDuration:300,showEasing:"swing",onShown:void 0,hideMethod:"fadeOut",hideDuration:1e3,hideEasing:"swing",onHidden:void 0,closeMethod:!1,closeDuration:!1,closeEasing:!1,closeOnHover:!0,extendedTimeOut:1e3,iconClasses:{error:"toast-error",info:"toast-info",success:"toast-success",warning:"toast-warning"},iconClass:"toast-info",positionClass:"toast-top-right",timeOut:5e3,titleClass:"toast-title",messageClass:"toast-message",escapeHtml:!1,target:"body",closeHtml:'<button type="button">&times;</button>',closeClass:"toast-close-button",newestOnTop:!0,preventDuplicates:!1,progressBar:!1,progressClass:"toast-progress",rtl:!1}}function f(e){C&&C(e)}function g(t){function o(e){return null==e&&(e=""),e.replace(/&/g,"&amp;").replace(/"/g,"&quot;").replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function s(){c(),u(),d(),p(),g(),C(),l(),i()}function i(){var e="";switch(t.iconClass){case"toast-success":case"toast-info":e="polite";break;default:e="assertive"}I.attr("aria-live",e)}function a(){E.closeOnHover&&I.hover(H,D),!E.onclick&&E.tapToDismiss&&I.click(b),E.closeButton&&j&&j.click(function(e){e.stopPropagation?e.stopPropagation():void 0!==e.cancelBubble&&e.cancelBubble!==!0&&(e.cancelBubble=!0),E.onCloseClick&&E.onCloseClick(e),b(!0)}),E.onclick&&I.click(function(e){E.onclick(e),b()})}function r(){I.hide(),I[E.showMethod]({duration:E.showDuration,easing:E.showEasing,complete:E.onShown}),E.timeOut>0&&(k=setTimeout(b,E.timeOut),F.maxHideTime=parseFloat(E.timeOut),F.hideEta=(new Date).getTime()+F.maxHideTime,E.progressBar&&(F.intervalId=setInterval(x,10)))}function c(){t.iconClass&&I.addClass(E.toastClass).addClass(y)}function l(){E.newestOnTop?v.prepend(I):v.append(I)}function u(){if(t.title){var e=t.title;E.escapeHtml&&(e=o(t.title)),M.append(e).addClass(E.titleClass),I.append(M)}}function d(){if(t.message){var e=t.message;E.escapeHtml&&(e=o(t.message)),B.append(e).addClass(E.messageClass),I.append(B)}}function p(){E.closeButton&&(j.addClass(E.closeClass).attr("role","button"),I.prepend(j))}function g(){E.progressBar&&(q.addClass(E.progressClass),I.prepend(q))}function C(){E.rtl&&I.addClass("rtl")}function O(e,t){if(e.preventDuplicates){if(t.message===w)return!0;w=t.message}return!1}function b(t){var n=t&&E.closeMethod!==!1?E.closeMethod:E.hideMethod,o=t&&E.closeDuration!==!1?E.closeDuration:E.hideDuration,s=t&&E.closeEasing!==!1?E.closeEasing:E.hideEasing;if(!e(":focus",I).length||t)return clearTimeout(F.intervalId),I[n]({duration:o,easing:s,complete:function(){h(I),clearTimeout(k),E.onHidden&&"hidden"!==P.state&&E.onHidden(),P.state="hidden",P.endTime=new Date,f(P)}})}function D(){(E.timeOut>0||E.extendedTimeOut>0)&&(k=setTimeout(b,E.extendedTimeOut),F.maxHideTime=parseFloat(E.extendedTimeOut),F.hideEta=(new Date).getTime()+F.maxHideTime)}function H(){clearTimeout(k),F.hideEta=0,I.stop(!0,!0)[E.showMethod]({duration:E.showDuration,easing:E.showEasing})}function x(){var e=(F.hideEta-(new Date).getTime())/F.maxHideTime*100;q.width(e+"%")}var E=m(),y=t.iconClass||E.iconClass;if("undefined"!=typeof t.optionsOverride&&(E=e.extend(E,t.optionsOverride),y=t.optionsOverride.iconClass||y),!O(E,t)){T++,v=n(E,!0);var k=null,I=e("<div/>"),M=e("<div/>"),B=e("<div/>"),q=e("<div/>"),j=e(E.closeHtml),F={intervalId:null,hideEta:null,maxHideTime:null},P={toastId:T,state:"visible",startTime:new Date,options:E,map:t};return s(),r(),a(),f(P),E.debug&&console&&console.log(P),I}}function m(){return e.extend({},p(),b.options)}function h(e){v||(v=n()),e.is(":visible")||(e.remove(),e=null,0===v.children().length&&(v.remove(),w=void 0))}var v,C,w,T=0,O={error:"error",info:"info",success:"success",warning:"warning"},b={clear:r,remove:c,error:t,getContainer:n,info:o,options:{},subscribe:s,success:i,version:"2.1.4",warning:a};return b}()})}("function"==typeof define&&define.amd?define:function(e,t){"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):window.toastr=t(window.jQuery)});
+//# sourceMappingURL=toastr.js.map

resources/views/layouts/master.blade.php

@@ -13,8 +13,27 @@
 </head>
 <body class="hold-transition @yield('body_class')">
 <div class="il-isimleri"></div>
-
+<script>
+    var module = { };
+</script>
 <script src="{{mix('/js/liman.js')}}"></script>
+@if(auth()->check())
+<script>
+    Echo.private('App.User.{{auth()->user()->id}}')
+        .notification((notification) => {
+            let data = notification['\u0000*\u0000attributes'];
+            let errors = [
+                "error" , "health_problem", "liman_update"
+            ];
+            if(errors.includes(data.type)){
+                toastr.error(data.message, data.title, {timeOut: 5000})
+            }else{
+                toastr.success(data.message, data.title, {timeOut: 5000})
+            }
+            checkNotifications(data.id);
+        });
+</script>
+@endif
 @yield('body')
 
 </body>
@@ -41,9 +60,7 @@
             document.title = title + " / Liman";
         }
         @if(auth()->check())
-        setInterval(function () {
             checkNotifications();
-        }, 10000);
         @endif
 
         $('.ext_nav').slice({{env('NAV_EXTENSION_HIDE_COUNT', 10)}}, $('.ext_nav').length).hide();

webpack.mix.js

@@ -14,6 +14,7 @@ mix.styles([
     'resources/assets/css/bootstrap-datepicker.css',
     'resources/assets/css/bootstrap-timepicker.css',
     'resources/assets/css/select2.min.css',
+    'resources/assets/css/toastr.min.css',
 ], 'public/css/liman.css').version();
 mix.combine([
     'resources/assets/js/jquery.js',
@@ -28,11 +29,14 @@ mix.combine([
     'resources/assets/js/sweetalert2.min.js',
     'resources/assets/js/Chart.js',
     'resources/assets/js/jstree.js',
-    'resources/assets/js/liman.js',
     'resources/assets/js/buttons.html5.min.js',
     'resources/assets/js/dataTables.buttons.min.js',
     'resources/assets/js/jszip.min.js',
     'resources/assets/js/pdfmake.min.js',
     'resources/assets/js/vfs_fonts.js',
-    'resources/assets/js/jquery.inputmask.min.js'
+    'resources/assets/js/jquery.inputmask.min.js',
+    'resources/assets/js/toastr.min.js',
+    'resources/assets/js/echo.common.js',
+    'resources/assets/js/pusher.min.js',
+    'resources/assets/js/liman.js',
 ], 'public/js/liman.js').version();