feature/new-feature-cleanup (#389)

* add json editor to theme editor

* add toolbars tools to recipe sections

* fix recipe yield

* add updated_date to recipe schema

* update time cards

* fix mobile buttons

* fix asset URL

* fix PG errors CRUD

* remove -d from docker-pro

* fix theme tests

* remvoe old typing

* abstract count function

Co-authored-by: hay-kot <hay-kot@pm.me>

frontend/src/components/Recipe/MobileRecipeCard.vue

@@ -8,7 +8,7 @@
         <v-list-item-title class=" mb-1">{{ name }} </v-list-item-title>
         <v-list-item-subtitle> {{ description }} </v-list-item-subtitle>
         <div class="d-flex justify-center align-center">
-          <RecipeChips :items="tags" :title="false" :limit="1" :small="true" :isCategory="false" />
+          <RecipeChips :truncate="true" :items="tags" :title="false" :limit="1" :small="true" :isCategory="false" />
           <v-rating
             color="secondary"
             class="ml-auto"

frontend/src/components/Recipe/Parts/Ingredients.vue

@@ -56,7 +56,7 @@
 import BulkAdd from "@/components/Recipe/Parts/Helpers/BulkAdd";
 import VueMarkdown from "@adapttive/vue-markdown";
 import draggable from "vuedraggable";
-import utils from "@/utils";
+import { utils } from "@/utils";
 export default {
   components: {
     BulkAdd,

frontend/src/components/Recipe/Parts/Instructions.vue

@@ -66,7 +66,7 @@
 
 <script>
 import VueMarkdown from "@adapttive/vue-markdown";
-import utils from "@/utils";
+import { utils } from "@/utils";
 export default {
   components: {
     VueMarkdown,

frontend/src/components/Recipe/Parts/Notes.vue

@@ -35,7 +35,7 @@
 
 <script>
 import VueMarkdown from "@adapttive/vue-markdown";
-import utils from "@/utils";
+import { utils } from "@/utils";
 export default {
   components: {
     VueMarkdown,

frontend/src/components/Recipe/RecipeCard.vue

@@ -25,7 +25,7 @@
       <v-card-actions>
         <Rating :value="rating" :name="name" :slug="slug" :small="true" />
         <v-spacer></v-spacer>
-        <RecipeChips :items="tags" :title="false" :limit="2" :small="true" :isCategory="false" />
+        <RecipeChips :truncate="true" :items="tags" :title="false" :limit="2" :small="true" :isCategory="false" />
         <ContextMenu :slug="slug" />
       </v-card-actions>
     </v-card>

frontend/src/components/Recipe/RecipePrint.vue

@@ -124,7 +124,7 @@
 </template>
 
 <script>
-import utils from "@/utils";
+import { utils } from "@/utils";
 import { api } from "@/api";
 
 export default {

frontend/src/components/Recipe/RecipeTimeCard.vue

@@ -1,29 +1,13 @@
 <template>
-  <v-card
-    color="accent"
-    class="custom-transparent d-flex justify-start align-center text-center time-card-flex"
-    tile
-    v-if="showCards"
-  >
-    <v-card flat color="rgb(255, 0, 0, 0.0)">
-      <v-icon large color="white" class="mx-2"> mdi-clock-outline </v-icon>
-    </v-card>
-
-    <v-card
-      v-for="(time, index) in allTimes"
-      :key="index"
-      class="d-flex justify-start align-center text-center time-card-flex"
-      flat
-      color="rgb(255, 0, 0, 0.0)"
-    >
-      <v-card-text class="caption white--text py-2">
-        <div>
-          <strong> {{ time.name }} </strong>
-        </div>
-        <div>{{ time.value }}</div>
-      </v-card-text>
-    </v-card>
-  </v-card>
+  <div>
+    <v-chip label color="accent custom-transparent" class="ma-1" v-for="(time, index) in allTimes" :key="index">
+      <v-icon left>
+        mdi-clock-outline
+      </v-icon>
+      {{ time.name }} |
+      {{ time.value }}
+    </v-chip>
+  </div>
 </template>
 
 <script>

frontend/src/components/Recipe/RecipeViewer/RecipeChips.vue

@@ -11,7 +11,7 @@
       :to="`/recipes/${urlParam}/${getSlug(category)}`"
       :key="category"
     >
-      {{ category }}
+      {{ truncateText(category) }}
     </v-chip>
   </div>
 </template>
@@ -19,6 +19,9 @@
 <script>
 export default {
   props: {
+    truncate: {
+      default: false,
+    },
     items: {
       default: [],
     },
@@ -34,6 +37,7 @@ export default {
     small: {
       default: false,
     },
+    maxWidth: {},
   },
   computed: {
     allCategories() {
@@ -58,6 +62,14 @@ export default {
         if (matches.length > 0) return matches[0].slug;
       }
     },
+    truncateText(text, length = 20, clamp) {
+      if (!this.truncate) return text;
+      clamp = clamp || "...";
+      var node = document.createElement("div");
+      node.innerHTML = text;
+      var content = node.textContent;
+      return content.length > length ? content.slice(0, length) + clamp : content;
+    },
   },
 };
 </script>

frontend/src/components/Recipe/RecipeViewer/index.vue

@@ -8,7 +8,7 @@
       <v-row dense disabled>
         <v-col>
           <v-btn
-            v-if="recipe.yields"
+            v-if="recipe.recipeYield"
             dense
             small
             :hover="false"
@@ -18,7 +18,7 @@
             color="secondary darken-1"
             class="rounded-sm static"
           >
-            {{ recipe.yields }}
+            {{ recipe.recipeYield }}
           </v-btn>
         </v-col>
         <Rating :value="recipe.rating" :name="recipe.name" :slug="recipe.slug" />
@@ -88,7 +88,7 @@
 <script>
 import Nutrition from "@/components/Recipe/Parts/Nutrition";
 import VueMarkdown from "@adapttive/vue-markdown";
-import utils from "@/utils";
+import { utils } from "@/utils";
 import RecipeChips from "./RecipeChips";
 import Rating from "@/components/Recipe/Parts/Rating";
 import Notes from "@/components/Recipe/Parts/Notes";