fix

3 years ago · 3c8e5d289f
parent e831470936 38081714df
commit 3c8e5d289f
4 changed files with 14258 additions and 5420 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -17634,6 +17634,7 @@
            }
        },
        "adjust-sourcemap-loader": {
+<<<<<<< HEAD
            "version": "3.0.0",
            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz",
            "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==",
@ -17661,6 +17662,65 @@
                        "big.js": "^5.2.2",
                        "emojis-list": "^3.0.0",
                        "json5": "^2.1.2"
+=======
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-2.0.0.tgz",
+            "integrity": "sha512-4hFsTsn58+YjrU9qKzML2JSSDqKvN8mUGQ0nNIrfPi8hmIONT4L3uUaT6MKdMsZ9AjsU6D2xDkZxCkbQPxChrA==",
+            "dev": true,
+            "requires": {
+                "assert": "1.4.1",
+                "camelcase": "5.0.0",
+                "loader-utils": "1.2.3",
+                "object-path": "0.11.4",
+                "regex-parser": "2.2.10"
+            },
+            "dependencies": {
+                "assert": {
+                    "version": "1.4.1",
+                    "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+                    "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+                    "dev": true,
+                    "requires": {
+                        "util": "0.10.3"
+                    }
+                },
+                "camelcase": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+                    "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+                    "dev": true
+                },
+                "emojis-list": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+                    "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+                    "dev": true
+                },
+                "inherits": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                    "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+                    "dev": true
+                },
+                "loader-utils": {
+                    "version": "1.2.3",
+                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+                    "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+                    "dev": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^2.0.0",
+                        "json5": "^1.0.1"
+                    }
+                },
+                "util": {
+                    "version": "0.10.3",
+                    "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+                    "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+                    "dev": true,
+                    "requires": {
+                        "inherits": "2.0.1"
+>>>>>>> UI.page-editor
                    }
                }
            }
@ -19260,9 +19320,15 @@
            "dev": true
        },
        "codemirror": {
+<<<<<<< HEAD
            "version": "5.60.0",
            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.60.0.tgz",
            "integrity": "sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA=="
+=======
+            "version": "5.59.3",
+            "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.3.tgz",
+            "integrity": "sha512-p1d4BjmBBssgnEGtQeWvE5PdiDffqZjiJ77h2FZ2J2BpW9qdOzf6v7IQscyE+TgyKBQS3PpsYimfEDNgcNRZGQ=="
+>>>>>>> UI.page-editor
        },
        "collect.js": {
            "version": "4.28.6",
@ -20828,9 +20894,15 @@
            },
            "dependencies": {
                "type": {
+<<<<<<< HEAD
                    "version": "2.5.0",
                    "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
                    "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
+=======
+                    "version": "2.3.0",
+                    "resolved": "https://registry.npmjs.org/type/-/type-2.3.0.tgz",
+                    "integrity": "sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==",
+>>>>>>> UI.page-editor
                    "dev": true
                }
            }
@ -23977,6 +24049,15 @@
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+<<<<<<< HEAD
+=======
+        },
+        "object-path": {
+            "version": "0.11.4",
+            "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz",
+            "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=",
+            "dev": true
+>>>>>>> UI.page-editor
        },
        "object-to-formdata": {
            "version": "2.3.1",
@ -25956,9 +26037,15 @@
            }
        },
        "regex-parser": {
+<<<<<<< HEAD
            "version": "2.2.11",
            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
            "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+=======
+            "version": "2.2.10",
+            "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.10.tgz",
+            "integrity": "sha512-8t6074A68gHfU8Neftl0Le6KTDwfGAj7IyjPIMSfikI2wJUTHDMaIq42bUsfVnj8mhx0R+45rdUXHGpN164avA==",
+>>>>>>> UI.page-editor
            "dev": true
        },
        "regexp.prototype.flags": {
@ -26159,6 +26246,7 @@
            "dev": true
        },
        "resolve-url-loader": {
+<<<<<<< HEAD
            "version": "3.1.2",
            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
            "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
@ -26171,6 +26259,20 @@
                "es6-iterator": "2.0.3",
                "loader-utils": "1.2.3",
                "postcss": "7.0.21",
+=======
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz",
+            "integrity": "sha512-2QcrA+2QgVqsMJ1Hn5NnJXIGCX1clQ1F6QJTqOeiaDw9ACo1G2k+8/shq3mtqne03HOFyskAClqfxKyFBriXZg==",
+            "dev": true,
+            "requires": {
+                "adjust-sourcemap-loader": "2.0.0",
+                "camelcase": "5.0.0",
+                "compose-function": "3.0.3",
+                "convert-source-map": "1.6.0",
+                "es6-iterator": "2.0.3",
+                "loader-utils": "1.2.3",
+                "postcss": "7.0.14",
+>>>>>>> UI.page-editor
                "rework": "1.0.1",
                "rework-visit": "1.0.0",
                "source-map": "0.6.1"
@ -26185,6 +26287,15 @@
                        "color-convert": "^1.9.0"
                    }
                },
+<<<<<<< HEAD
+=======
+                "camelcase": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+                    "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+                    "dev": true
+                },
+>>>>>>> UI.page-editor
                "chalk": {
                    "version": "2.4.2",
                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@ -26222,6 +26333,18 @@
                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
                    "dev": true
                },
+<<<<<<< HEAD
+=======
+                "convert-source-map": {
+                    "version": "1.6.0",
+                    "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+                    "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "~5.1.1"
+                    }
+                },
+>>>>>>> UI.page-editor
                "emojis-list": {
                    "version": "2.1.0",
                    "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
@ -26246,9 +26369,15 @@
                    }
                },
                "postcss": {
+<<<<<<< HEAD
                    "version": "7.0.21",
                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
                    "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+=======
+                    "version": "7.0.14",
+                    "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
+                    "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+>>>>>>> UI.page-editor
                    "dev": true,
                    "requires": {
                        "chalk": "^2.4.2",
@ -26256,6 +26385,15 @@
                        "supports-color": "^6.1.0"
                    }
                },
+<<<<<<< HEAD
+=======
+                "safe-buffer": {
+                    "version": "5.1.2",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+                    "dev": true
+                },
+>>>>>>> UI.page-editor
                "supports-color": {
                    "version": "6.1.0",
                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@ -28522,8 +28660,12 @@
        "vue-js-toggle-button": {
            "version": "1.3.3",
            "resolved": "https://registry.npmjs.org/vue-js-toggle-button/-/vue-js-toggle-button-1.3.3.tgz",
+<<<<<<< HEAD
            "integrity": "sha512-0b920oztgK+1SqlYF26MPiT28hAieL5aAQE7u21XEym5ryfzD4EMer4hLkgDC/1sWsCHb22GvV+t1Kb4AI6QFw==",
            "requires": {}
+=======
+            "integrity": "sha512-0b920oztgK+1SqlYF26MPiT28hAieL5aAQE7u21XEym5ryfzD4EMer4hLkgDC/1sWsCHb22GvV+t1Kb4AI6QFw=="
+>>>>>>> UI.page-editor
        },
        "vue-loader": {
            "version": "15.9.6",
@ -28545,9 +28687,15 @@
            "dev": true
        },
        "vue-masonry-wall": {
+<<<<<<< HEAD
            "version": "0.3.2",
            "resolved": "https://registry.npmjs.org/vue-masonry-wall/-/vue-masonry-wall-0.3.2.tgz",
            "integrity": "sha512-uy/tY9Lz6zVZCXmS78sv5u1yf70gAC+ElFXdV8miJfLiNnzXXt2i03I8sccx2YXDKk1IOZv6wDbKTUL8ethvfw==",
+=======
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/vue-masonry-wall/-/vue-masonry-wall-0.3.1.tgz",
+            "integrity": "sha512-lba8LO2lSRVFmgL/L8z6UC5dIZUAGtFeb5As1/VbYTjvf9G5sEQ4qrrvvoh2AA4beMqgvW9ApJBEXsc9eYPoVg==",
+>>>>>>> UI.page-editor
            "requires": {
                "vue-observe-visibility": "^0.4.6"
            }
@ -28637,8 +28785,12 @@
        "vue-select": {
            "version": "3.11.2",
            "resolved": "https://registry.npmjs.org/vue-select/-/vue-select-3.11.2.tgz",
+<<<<<<< HEAD
            "integrity": "sha512-pIOcY8ajWNSwg8Ns4eHVr5ZWwqKCSZeQRymTnlUI8i+3QiQXF6JIM4lylK6mVfbccs4S6vOyxB7zmJBpp7tDUg==",
            "requires": {}
+=======
+            "integrity": "sha512-pIOcY8ajWNSwg8Ns4eHVr5ZWwqKCSZeQRymTnlUI8i+3QiQXF6JIM4lylK6mVfbccs4S6vOyxB7zmJBpp7tDUg=="
+>>>>>>> UI.page-editor
        },
        "vue-style-loader": {
            "version": "4.1.2",
--- a/resources/views/Test.blade.php
+++ b/resources/views/Test.blade.php
--- a/routes/web.php
+++ b/routes/web.php
@ -12,5 +12,6 @@
 */

 Route::view('main/{any?}', 'Home');
+Route::view('test/web-builder', 'Test');
 Route::view('WebsiteManagement/{any?}', 'WebsiteManagement');
 Route::redirect('{any?}/{any1?}/{any3?}', '/main/home');
--- a/yarn.lock
+++ b/yarn.lock