Merge pull request #44 from webreinvent/release/v0.1.10

themodernpk · web-flow · commit 767837e297ca · 2023-02-16T14:02:53.000+05:30
release -&gt; master | v0.1.10
diff --git a/Entities/ContentFormField.php b/Entities/ContentFormField.php
@@ -166,7 +166,9 @@ public static function getContentAsset($content,$type)
     {
         $value = $content;
 
-        if($content && $type && ($type == 'image' || $type == 'media'))
+        if($content && $type
+            && ($type == 'image' || $type == 'media')
+            && is_string($content))
         {
             $value = asset($content);
         }
diff --git a/Resources/assets/build/app.js b/Resources/assets/build/app.js
diff --git a/Resources/views/backend/pages/app.blade.php b/Resources/views/backend/pages/app.blade.php
@@ -18,11 +18,13 @@
 
 @section('content')
 
-    <div id="cmsApp">
+    <div id="cmsApp" class="bulma">
 
-        <router-view></router-view>
+        <section class="section has-padding-25">
+            <router-view></router-view>
 
-        <vue-progress-bar></vue-progress-bar>
+            <vue-progress-bar></vue-progress-bar>
+        </section>
 
     </div>
 
diff --git a/Vue/pages/content-types/ContentStructure.vue b/Vue/pages/content-types/ContentStructure.vue
@@ -53,7 +53,7 @@
                         <div class="card" v-if="item.groups.length > 0"
                              v-for="(group,index) in item.groups">
 
-                            <div class="card-header">
+                            <div class="card-header is-shadowless">
 
                                 <div class="card-header-title">
                                     <span>{{$vaah.limitString(group.name, 20)}}</span>
@@ -98,14 +98,14 @@
 
                             <div class="card-content is-paddingless">
 
-                                <div class="draggable" >
-                                    <draggable class="dropzone" :list="group.fields"
+                                <div class="draggable">
+                                    <draggable class="dropzone has-padding-15" :list="group.fields"
                                                :group="{name:'fields'}">
                                         <div v-if="group.fields.length>0"
                                              v-for="(field, f_index) in group.fields"
                                              :key="f_index">
-                                            <div class="dropzone-field">
-                                                <b-field class="is-marginless" >
+                                            <div class="dropzone-field has-margin-bottom-10">
+                                                <b-field class="is-marginless">
                                                     <p class="control drag">
                                                         <span class="button is-static">:::</span>
                                                     </p>
@@ -139,7 +139,7 @@
                                                     </b-tooltip>
 
                                                 </b-field>
-                                                <div class="dropzone-field-options ">
+                                                <div class="dropzone-field-options" style="display: none">
 
                                                     <table class="table">
 
diff --git a/Vue/pages/menus/partials/NestedDraggable.vue b/Vue/pages/menus/partials/NestedDraggable.vue
@@ -50,7 +50,7 @@
                 </b-field>
 
 
-                <div class="menu-item-settings has-padding-top-15 has-padding-bottom-15 hide">
+                <div class="menu-item-settings has-padding-top-15 has-padding-bottom-15 hide" style="display: none">
 
                     <b-field label=" " :label-position="labelPosition">
                         <b-checkbox v-model="el.attr_target_blank">Open in new window</b-checkbox>
diff --git a/Vue/vaahvue b/Vue/vaahvue
@@ -1 +1 @@
-Subproject commit 8278439de4d630571bc7318d638df78fd7b9da98
+Subproject commit f153ee561da90b6962c7466a4b5195bc24e963d1
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "vaahcms/cms",
     "description": "Cms",
-    "version": "0.1.9",
+    "version": "0.1.10",
     "authors": [
         {
             "name": "vaah",
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
         "bulma-helpers": "^0.3.12",
         "compass-mixins": "^0.12.10",
         "copy-to-clipboard": "^3.3.1",
+        "css-loader": "^5.2.7",
         "filepond": "^4.25.1",
         "filepond-plugin-file-rename": "^1.1.6",
         "filepond-plugin-file-validate-size": "^2.2.2",
@@ -63,6 +64,7 @@
         "moment": "^2.24.0",
         "moment-timezone": "^0.5.33",
         "slugify": "^1.3.6",
+        "style-loader": "^2.0.0",
         "tiptap": "^1.4",
         "tiptap-extensions": "^1.35",
         "uuid": "^8.0.0",

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,9 @@ public static function getContentAsset($content,$type)`
`166`	`166`	`{`
`167`	`167`	`$value = $content;`
`168`	`168`
`169`		`- if($content && $type && ($type == 'image' \|\| $type == 'media'))`
	`169`	`+ if($content && $type`
	`170`	`+ && ($type == 'image' \|\| $type == 'media')`
	`171`	`+ && is_string($content))`
`170`	`172`	`{`
`171`	`173`	`$value = asset($content);`
`172`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vaahcms/cms",`
`3`	`3`	`"description": "Cms",`
`4`		`- "version": "0.1.9",`
	`4`	`+ "version": "0.1.10",`
`5`	`5`	`"authors": [`
`6`	`6`	`{`
`7`	`7`	`"name": "vaah",`