Merge branch 'new-formfield'

composer.json

@@ -10,7 +10,7 @@
         "guzzlehttp/guzzle": "^6.3",
         "laracasts/presenter": "^0.2.1",
         "laravel/framework": "5.5.*",
-        "luthfi/formfield": "^0.2.7",
+        "luthfi/formfield": "^1.0",
         "riskihajar/terbilang": "^1.2",
         "spatie/laravel-fractal": "^5.0"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "2bc96e7774d2ea1a74f716dc9d8dee43",
+    "content-hash": "fd28a38cbcaf3bccc1d6fb34444372ee",
     "packages": [
         {
             "name": "backup-manager/backup-manager",
@@ -938,20 +938,20 @@
         },
         {
             "name": "luthfi/formfield",
-            "version": "0.2.8",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nafiesl/FormField.git",
-                "reference": "ee183f6ff92b34eecb18ca5335073de5061b76be"
+                "reference": "4cde2467fa8dd4b5411d33176adab986d8c1050a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nafiesl/FormField/zipball/ee183f6ff92b34eecb18ca5335073de5061b76be",
-                "reference": "ee183f6ff92b34eecb18ca5335073de5061b76be",
+                "url": "https://api.github.com/repos/nafiesl/FormField/zipball/4cde2467fa8dd4b5411d33176adab986d8c1050a",
+                "reference": "4cde2467fa8dd4b5411d33176adab986d8c1050a",
                 "shasum": ""
             },
             "require": {
-                "laravelcollective/html": "5.3.* || 5.4.* || 5.5.* || 5.6.*",
+                "laravelcollective/html": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.*",
                 "php": ">=5.6.4"
             },
             "require-dev": {
@@ -985,8 +985,8 @@
                     "email": "nafiesl@gmail.com"
                 }
             ],
-            "description": "Laravel Form Field the extension of Laravelcollective Form for Laravel 5.3, 5.4 and 5.5 with Twitter Bootstrap 3",
-            "time": "2018-06-25T14:09:59+00:00"
+            "description": "Laravel Form Field the extension of Laravelcollective Form for Laravel 5.3 and newer with Twitter Bootstrap 3",
+            "time": "2018-09-11T16:00:18+00:00"
         },
         {
             "name": "monolog/monolog",

package.json

@@ -15,7 +15,6 @@
     "cross-env": "^3.2.3",
     "jquery": "^3.1.1",
     "laravel-mix": "0.*",
-    "lodash": "^4.17.4",
-    "vue": "^2.1.10"
+    "lodash": "^4.17.4"
   }
 }

resources/assets/js/app.js

@@ -6,17 +6,3 @@
  */
 
 require('./bootstrap');
-
-window.Vue = require('vue');
-
-/**
- * Next, we will create a fresh Vue application instance and attach it to
- * the page. Then, you may begin adding components to this application
- * or customize the JavaScript scaffolding to fit your unique needs.
- */
-
-Vue.component('example', require('./components/Example.vue'));
-
-const app = new Vue({
-    el: '#app'
-});

resources/assets/js/components/Example.vue

@@ -1,23 +0,0 @@
-<template>
-    <div class="container">
-        <div class="row">
-            <div class="col-md-8 col-md-offset-2">
-                <div class="panel panel-default">
-                    <div class="panel-heading">Example Component</div>
-
-                    <div class="panel-body">
-                        I'm an example component!
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        mounted() {
-            console.log('Component mounted.')
-        }
-    }
-</script>

resources/assets/sass/app.scss

@@ -10,10 +10,6 @@
  * For details, see http://www.apache.org/licenses/LICENSE-2.0.
  */
 
-body {
-    // font-family: "trebuchet ms", Helvetica, serif;
-}
-
 ul, ol {
     margin-bottom: 0;
     padding-left: 20px;
@@ -78,10 +74,6 @@ label.control-label {
         padding: 0;
         position: relative;
     }
-/*
-    .hidden-xs {
-        display: block;
-    }*/
 
     nav.hidden-md {
         display: none;
@@ -100,19 +92,10 @@ label.control-label {
     .index-search-form {
         width: 50%;
     }
-
-    /*.dropdown:hover .dropdown-menu {
-        display: block;
-    }
-    .navbar-default .navbar-nav>li>a:hover {
-        color: #555;
-        background-color: #eee;
-    }*/
 }
 
 .form-error {
     color: #d9534f;
-    /*font-weight: 700;*/
 }
 
 div.notifier {
@@ -176,18 +159,27 @@ h3.site-description {
     height: 30px;
     padding: 3px 6px;
 }
-/*
-.btn {
-    padding: 3px 6px;
-}
-
-.btn-xs {
-    padding: 1px 5px;
-}*/
-
 
 @media print {
     #page-wrapper {
         margin-left: 0;
     }
+}
+
+.radio input[type=radio] {
+    margin-left: 0;
+}
+.checkbox input[type=checkbox] {
+    margin-left: 0;
+}
+.checkbox-inline, .radio-inline {
+    margin-top: 0;
+    margin-right: 10px;
+    padding-left: 0;
+}
+.form-check.unstyled {
+    margin-bottom: 6px;
+}
+.checkbox-inline+.checkbox-inline, .radio-inline+.radio-inline {
+    margin-left: 0;
 }

yarn.lock

@@ -5722,10 +5722,6 @@ vue-template-es2015-compiler@^1.2.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
-vue@^2.1.10:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.4.2.tgz#a9855261f191c978cc0dc1150531b8d08149b58c"
-
 ware@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"