Merge pull request #54 from avored/dev

merging dev to master

composer.json

@@ -26,9 +26,7 @@
 		"laravel/framework" : "5.7.*",
 		"barryvdh/laravel-dompdf": "0.8.*",
 		"laravel/passport": "7.0.*",
-		"stripe/stripe-php": "^6.3",
-		"beyondcode/laravel-self-diagnosis": "^1.0"
-
+		"stripe/stripe-php": "^6.3"
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "~7.0",
@@ -58,7 +56,7 @@
 				"Cart" : "AvoRed\\Framework\\Cart\\Facade",
 				"DataGrid" : "AvoRed\\Framework\\DataGrid\\Facade",
 				"Image" : "AvoRed\\Framework\\Image\\Facade",
-				"Menu" : "AvoRed\\Framework\\Menu\\Facade",
+				"Menu" : "AvoRed\\Framework\\Menu\\Facades\\Menu",
 				"Payment" : "AvoRed\\Framework\\Payment\\Facade",
 				"Permission" : "AvoRed\\Framework\\Permission\\Facade",
 				"Shipping" : "AvoRed\\Framework\\Shipping\\Facade",
@@ -76,4 +74,4 @@
 		"wiki" : "https://www.avored.com/docs",
 		"source" : "https://www.github.com/avored/framework"
 	}
-}
+}

resources/assets/js/app.js

@@ -16,12 +16,11 @@ try {
 } catch (e) {}
 
 require('select2');
-require('summernote');
 require('pc-bootstrap4-datetimepicker');
 require('chartjs');
 require('sweetalert');
-require('jquery-sortable');
 
+window.SimpleMDE = require('simplemde');
 window.Vue = require('vue');
 window.axios = require('axios');
 

resources/assets/js/bootstrap.js

@@ -7,3 +7,4 @@ import './skycons';
 import './datatable';
 import './utils';
 import './select2';
+import './menu'

resources/assets/js/masonry/index.js

@@ -1,14 +1,14 @@
-import * as $ from 'jquery';
+import $ from 'jquery';
 import Masonry from 'masonry-layout';
 
 export default (function () {
   window.addEventListener('load', () => {
     if ($('.masonry').length > 0) {
-      new Masonry('.masonry', {
-        itemSelector: '.masonry-item',
-        columnWidth: '.masonry-sizer',
-        percentPosition: true,
-      });
-    }
+      return new Masonry('.masonry', {
+          itemSelector: '.masonry-item',
+          columnWidth: '.masonry-sizer',
+          percentPosition: true,
+        });
+      }
   });
 }());

resources/assets/js/menu/index.js

@@ -0,0 +1,84 @@
+
+
+import jQuery from 'jquery';
+
+export default (function () {
+    class Menu {
+
+        constructor() {
+            jQuery('.left-menu li').on('dragstart', this.navDragStart);
+
+            jQuery('.dropable-menu-tree li').on('drop', this.navDropEvent);
+            jQuery('.dropable-menu-tree li').on('dragover', this.navDragOver);
+        }
+
+
+        navDragStart(e) {
+            e.preventDefault();
+            window.x = e;
+            e.originalEvent.dataTransfer.setData("draggable_nav_id", e.target.id);
+            console.log(e.target.id);
+        }
+
+        navDragOver(e) {
+            alert('jhere');
+            e.preventDefault();
+        }
+
+        navDropEvent(e) {
+            alert('drop event');
+            let navId = e.originalEvent.dataTransfer.getData("draggable_nav_id");
+            console.log(navId);
+        }
+
+
+      }
+
+      let menu = new Menu();
+
+
+
+    jQuery('#menu-nav-list li:first-child a').tab('show')
+
+    /*             var frontMenu = jQuery("ul.front-menu").sortable({
+                nested: true,
+                group: "front-menu",
+                onDragStart: function ($item, container, _super) {
+                    if (!container.options.drop) {
+                        $item.clone().insertAfter($item);
+                    }
+                    _super($item, container);
+                },
+                onDrop: function ($item, container, _super) {
+                    var data = frontMenu.sortable("serialize").get();
+                    var jsonString = JSON.stringify(data, null, ' ');
+                    jQuery('#menu-list').val(jsonString);
+                    _super($item, container);
+                }
+            });
+
+            jQuery('.left-menu').sortable({
+                group: "front-menu",
+                itemSelector: 'li',
+                drag: true,
+                drop: false
+            });
+
+            jQuery(document).on('click', '.destroy-menu', function (e) {
+                e.preventDefault();
+                jQuery(e.target).parents('li:first').remove();
+
+                var data = frontMenu.sortable("serialize").get();
+
+                var jsonString = JSON.stringify(data, null, ' ');
+                jQuery('#menu-list').val(jsonString);
+                _super($item, container);
+            });
+
+           
+            
+            //let data = frontMenu.sortable("serialize").get();
+            //let current_menu = JSON.stringify(data, null, ' ');
+            //jQuery('#menu-list').val(current_menu);
+    */
+}())

resources/assets/js/scrollbar/index.js

@@ -5,7 +5,7 @@ export default (function () {
   const scrollables = $('.scrollable');
   if (scrollables.length > 0) {
     scrollables.each((index, el) => {
-      new PerfectScrollbar(el);
+      return new PerfectScrollbar(el);
     });
   }
 }());

resources/assets/sass/app.scss

@@ -3,6 +3,7 @@
 @import "~bootstrap/scss/bootstrap";
 @import 'spec/index';
 @import 'vendor/index';
+@import '~simplemde/dist/simplemde.min.css';
 
 .card-header {
     color: $white;
@@ -21,7 +22,18 @@ img {
 #dataTable tr th:last-of-type {
     min-width: 95px;
 }
-
+.display-menu-tree {
+    border: 3px dotted;
+    border-color: $primary;
+    padding: 10px;
+    margin-bottom: 10px;
+}
+.left-menu {
+    li {
+        cursor: move;
+        border: 3px dotted;
+    }
+}
 .select2-container--default .select2-selection--single,
 .select2-container--default .select2-search--dropdown .select2-search__field,
 .select2-dropdown {