diff --git a/app/javascript/components/AppIcon.vue b/app/javascript/components/AppIcon.vue index c10f9ee..bc51e7a 100644 --- a/app/javascript/components/AppIcon.vue +++ b/app/javascript/components/AppIcon.vue @@ -33,6 +33,7 @@ menu: new IconData('menu'), pencil: new IconData('pencil'), person: new IconData('person'), + 'question-mark': new IconData('question-mark'), star: new IconData('star'), 'star-empty': new IconData('star-empty'), warning: new IconData('warning'), diff --git a/app/javascript/components/AppIconicIcon.vue b/app/javascript/components/AppIconicIcon.vue index 1baa53f..5e81dcb 100644 --- a/app/javascript/components/AppIconicIcon.vue +++ b/app/javascript/components/AppIconicIcon.vue @@ -10,6 +10,7 @@ import Link from "../iconic/svg/smart/link"; import Lock from "../iconic/svg/smart/lock"; import Menu from "../iconic/svg/smart/menu"; + import QuestionMark from "../iconic/svg/smart/question-mark.svg" import Person from "../iconic/svg/smart/person"; import Pencil from "../iconic/svg/smart/pencil"; import Star from "../iconic/svg/smart/star"; @@ -35,6 +36,7 @@ menu: Menu, pencil: Pencil, person: Person, + 'question-mark': QuestionMark, star: Star, 'star-empty': StarEmpty, warning: Warning, diff --git a/app/javascript/components/RecipeEdit.vue b/app/javascript/components/RecipeEdit.vue index ba17349..8d48f73 100644 --- a/app/javascript/components/RecipeEdit.vue +++ b/app/javascript/components/RecipeEdit.vue @@ -37,9 +37,9 @@ - +
- +
@@ -57,6 +57,150 @@ Is Ingredient
+ + +

+ The description editor uses Markdown. Follow the link for a full + description of the syntax, but below is a quick reference. +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
StyleSyntaxResult
Heading + 
+# Biggest Heading
+## Smaller Heading
+###### Smallest Heading
+
+ 		+

Biggest Heading

+

Smaller Heading

+
Smallest Heading
+
Numbered Lists + 
+1. First Item
+1. Second Item
+    1. subitem A
+    1. subitem B
+1. Thrid Item
+
+ 		+
    +
  1. First Item
    2. +
  2. Second Item +
      +
    1. subitem A
      2. +
    2. subitem B
      3. +
    +
    3. +
  3. Thrid Item
    4. +
+
Lists + 
+* First Item
+* Second Item
+    * subitem A
+    * subitem B
+* Third Item
+
+ 		+
    +
  • First Item
    • +
  • Second Item + +
      +
    • subitem A
      • +
    • subitem B
      • +
    • +
  • Third Item
    • +
+
Basic Styles + 
+*italics*
+**bold**
+***bold italics***
+_underline_
+==highlight==
+
+ 		+

+ italics
+ bold
+ bold italics
+ underline
+ highlight +

+
+ +

Basic Example

+
Input
+ 
+## For the dough
+1. Mix dry ingredients
+1. Fold in egg whites
+1. Sprinkle on sardines
+
+## For the sauce
+1. Blend clams ==thoroughly==
+1. Melt beef lard and add clam slurry
+
+### Optional (Toppings)
+* Raw onion
+* Sliced hard boiled eggs
+
+ +
Output
+ +
+

For the dough

+ +
    +
  1. Mix dry ingredients
    2. +
  2. Fold in egg whites
    3. +
  3. Sprinkle on sardines
    4. +
+ +

For the sauce

+ +
    +
  1. Blend clams thoroughly
    2. +
  2. Melt beef lard and add clam slurry
    3. +
+ +

Optional (Toppings)

+ +
    +
  • Raw onion
    • +
  • Sliced hard boiled eggs
    • +
+ +
+
@@ -83,7 +227,8 @@ data() { return { - stepPreviewCache: null + stepPreviewCache: null, + isDescriptionHelpOpen: false }; }, diff --git a/app/javascript/store/index.js b/app/javascript/store/index.js index 22503ed..faac798 100644 --- a/app/javascript/store/index.js +++ b/app/javascript/store/index.js @@ -19,19 +19,6 @@ export default new Vuex.Store({ taskLists: [], currentTaskList: null, - // MediaQueryList objects in the root App component maintain this state. - mediaQueries: { - mobile: false, - tablet: false, - tabletOnly: false, - touch: false, - desktop: false, - desktopOnly: false, - widescreen: false, - widescreenOnly: false, - fullhd: false - }, - nutrientList: { kcal: { label: "Calories", unit: "kcal" }, protein: { label: "Protein", unit: "g" }, diff --git a/config/application.rb b/config/application.rb index 5d0157e..521f801 100644 --- a/config/application.rb +++ b/config/application.rb @@ -24,6 +24,7 @@ module Parsley # Initialize configuration defaults for originally generated Rails version. config.load_defaults 6.0 + config.action_dispatch.cookies_same_site_protection = :lax config.active_record.collection_cache_versioning = true config.active_record.cache_versioning = true diff --git a/lib/markdown_processor.rb b/lib/markdown_processor.rb index 2394e5e..fd0bf37 100644 --- a/lib/markdown_processor.rb +++ b/lib/markdown_processor.rb @@ -9,7 +9,11 @@ module MarkdownProcessor { no_intra_emphasis: true, fenced_code_blocks: true, - disable_indented_code_blocks: true + disable_indented_code_blocks: true, + underline: true, + highlight: true, + quote: true, + autolink: true } end