@windward/core 0.1.2 → 0.1.4

package/components/Content/Blocks/ClickableIcons.vue

@@ -20,12 +20,11 @@
                 no-gutters
                 :class="rowClass(itemIndex)"
             >
-                <v-col cols="2">
+                <v-col cols="12" xl="2" lg="3" md="3" sm="3">
                     <v-btn
-                        class="pt-8 pb-8 outlined-button mb-4"
+                        class="button-icon pa-1 mb-4"
                         :color="itemColor(itemIndex)"
                         :fab="block.metadata.config.display.round_icon"
-                        x-large
                         outlined
                         @click="item.active = !item.active"
                     >
@@ -37,7 +36,7 @@
                         }}</span>
                     </v-btn>
                 </v-col>
-                <v-col cols="10">
+                <v-col cols="12" xl="10" lg="9" md="9" sm="9">
                     <h4
                         v-if="
                             block.metadata.config.display.show_title ||
@@ -185,9 +184,11 @@ export default {
 .option-container {
     border-radius: 1rem;
 }
-.outlined-button {
+.button-icon {
     border-width: 4px;
     background: #fff;
+    height: 74px !important;
+    width: 74px;
 }
 .text-icon {
     font-size: 1.5rem;

package/components/Content/Blocks/Email.vue

@@ -46,8 +46,15 @@
                     elevation="0"
                 >
                     <v-expansion-panel-header>
-                        <v-row>
-                            <v-col class="pa-0 d-flex align-center">
+                        <v-row class="container-header">
+                            <v-col
+                                xl="1"
+                                lg="1"
+                                md="1"
+                                sm="2"
+                                xs="2"
+                                class="pa-0 d-flex align-center"
+                            >
                                 <v-btn fab x-small class="primary" elevation="0"
                                     >{{ item.initials ? item.initials : '' }}
                                 </v-btn>
@@ -66,26 +73,54 @@
                                     color="secondary"
                                     >mdi-circle-medium</v-icon
                                 >
+                            </v-col>
+                            <v-col
+                                xl="1"
+                                lg="3"
+                                md="11"
+                                sm="10"
+                                xs="10"
+                                class="d-flex align-center"
+                            >
                                 <span class="span-details"
                                     >{{ item.from ? item.from : 'From' }}
                                 </span>
                             </v-col>
-                            <v-col> </v-col>
+                            <v-col
+                                v-if="selectedPanels !== index"
+                                xl="10"
+                                lg="8"
+                                class="d-flex align-center container-body-preview"
+                            >
+                                <div class="div-preview">
+                                    {{ onRemoveTags(item.body) }}
+                                </div>
+                            </v-col>
                         </v-row>
                     </v-expansion-panel-header>
                     <v-expansion-panel-content>
-                        <v-container class="pa-0 container-details">
+                        <v-container class="pa-0">
                             <v-row>
-                                <v-col cols="1"></v-col>
-                                <v-col class="pa-0 div-details">
-                                    <div class="div-details-to pl-4">
+                                <v-col
+                                    cols="1"
+                                    xl="1"
+                                    lg="1"
+                                    md="1"
+                                    sm="2"
+                                    xs="2"
+                                ></v-col>
+                                <v-col
+                                    class="div-details"
+                                    v-if="item.to || item.cc"
+                                >
+                                    <div class="div-details-to">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.to'
                                             )
                                         }}: {{ item.to }}
                                     </div>
-                                    <div class="div-details-cc pl-4">
+                                    <div class="div-details-cc">
                                         {{
                                             $t(
                                                 'windward.core.components.content.blocks.email.cc'
@@ -218,7 +253,11 @@ export default {
     mounted() {
         this.selectedPanels = this.block.metadata.config.emails.length - 1
     },
-    methods: {},
+    methods: {
+        onRemoveTags(body) {
+            return body.replace(/(<([^>]+)>)/gi, '')
+        },
+    },
 }
 </script>
 <style scoped>
@@ -228,12 +267,10 @@ export default {
 .column-simulation {
     font-size: 12px;
 }
-.container-details {
-    font-size: 10px;
-    margin-top: -26px;
-}
 .div-details {
     color: grey;
+    font-size: 10px;
+    margin-top: -25px;
 }
 .div-details-cc {
     margin-top: -9px;
@@ -245,4 +282,19 @@ export default {
 .v-expansion-panel {
     border: 1px solid var(--v-primary-base);
 }
+@media only screen and (max-width: 1264px) {
+    .container-body-preview {
+        display: none !important;
+    }
+}
+.div-preview {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-top: auto;
+    margin-bottom: auto;
+}
+.container-header {
+    width: 100%;
+}
 </style>

package/components/Content/Blocks/HorizontalRule.vue

@@ -0,0 +1,52 @@
+<template>
+    <div>
+        <hr :class="isDashed" />
+    </div>
+</template>
+<script>
+import _ from 'lodash'
+import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
+export default {
+    name: 'HorizontalRule',
+    extends: BaseContentBlock,
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        if (_.isEmpty(this.block.metadata)) {
+            this.block.metadata = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config.dashed)) {
+            this.block.metadata.config.dashed = false
+        }
+    },
+    data() {
+        return {
+            isDashed: 'solid',
+        }
+    },
+    watch: {
+        value(newValue) {
+            if (newValue.metadata.config.dashed) {
+                this.isDashed = 'dashed'
+            } else if (newValue.metadata.config.dashed === false) {
+                this.isDashed = 'solid'
+            }
+        },
+    },
+}
+</script>
+<style>
+.solid {
+    border-bottom: solid 1px var(--v-primary-base);
+}
+.dashed {
+    border-bottom: dashed 1px var(--v-primary-base);
+}
+</style>

package/components/Content/Blocks/Image.vue

@@ -1,50 +1,84 @@
 <template>
     <div>
-        <div v-if="!block.body" class="img-holder">
-            <v-skeleton-loader
-                height="300px"
-                :elevation="2"
-                type="image"
-            ></v-skeleton-loader>
+        <v-container class="pa-0 ma-0">
+            <div v-if="!block.body" class="img-holder">
+                <v-skeleton-loader
+                    height="300px"
+                    :elevation="2"
+                    type="image"
+                ></v-skeleton-loader>
 
-            <div class="no-source-overlay">
-                <v-icon x-large>mdi-file-question</v-icon><br />
-                {{
-                    $t(
-                        'windward.core.components.content.blocks.image.no_image_url'
-                    )
-                }}
+                <div class="no-source-overlay">
+                    <v-icon x-large>mdi-file-question</v-icon><br />
+                    {{
+                        $t(
+                            'windward.core.components.content.blocks.image.no_image_url'
+                        )
+                    }}
+                </div>
             </div>
-        </div>
-        <v-responsive :aspect-ratio="aspectRatio">
-            <v-img
-                v-if="block.body"
-                :alt="block.metadata.config.alt"
-                :aria-describedby="block.metadata.config.aria_described_by"
-                :class="imageClass"
-                :src="block.body"
-                contain
-            >
-                <template #placeholder>
-                    <v-skeleton-loader
-                        type="image, image, list-item-avatar"
-                        height="100%"
-                        width="100%"
-                    ></v-skeleton-loader>
-                </template>
-            </v-img>
-        </v-responsive>
-        <TextViewer
-            v-if="describedById"
-            v-model="describedByText"
-            :id="describedById"
-            class="sr-only"
-        ></TextViewer>
+            <v-responsive :aspect-ratio="aspectRatio">
+                <v-img
+                    v-if="block.body"
+                    :alt="block.metadata.config.alt"
+                    :aria-describedby="block.metadata.config.aria_described_by"
+                    :class="imageClass"
+                    :src="block.body"
+                    contain
+                    @click="onHandleModal"
+                >
+                    <template #placeholder>
+                        <v-skeleton-loader
+                            type="image, image, list-item-avatar"
+                            height="100%"
+                            width="100%"
+                        ></v-skeleton-loader>
+                    </template>
+                </v-img>
+            </v-responsive>
+            <TextViewer
+                v-if="describedById"
+                v-model="describedByText"
+                :id="describedById"
+                class="sr-only"
+            ></TextViewer>
+        </v-container>
+        <Dialog v-model="dialog" persistent :trigger="false">
+            <template #title></template>
+            <template #form="{ on, attrs }">
+                <v-responsive
+                    :aspect-ratio="aspectRatio"
+                    v-bind="attrs"
+                    v-on="on"
+                >
+                    <v-img
+                        v-if="block.body"
+                        :alt="block.metadata.config.alt"
+                        :aria-describedby="
+                            block.metadata.config.aria_described_by
+                        "
+                        :class="imageClass"
+                        :src="block.body"
+                        contain
+                        @click="onHandleModal"
+                    >
+                        <template #placeholder>
+                            <v-skeleton-loader
+                                type="image, image, list-item-avatar"
+                                height="100%"
+                                width="100%"
+                            ></v-skeleton-loader>
+                        </template>
+                    </v-img>
+                </v-responsive>
+            </template>
+        </Dialog>
     </div>
 </template>
 
 <script>
 import _ from 'lodash'
+import Dialog from '~/components/Dialog'
 import TextViewer from '~/components/Text/TextViewer'
 import Crypto from '~/helpers/Crypto'
 import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
@@ -53,12 +87,14 @@ export default {
     name: 'ContentBlockImage',
     extends: BaseContentBlock,
     components: {
+        Dialog,
         TextViewer,
     },
     data() {
         return {
             id: 'image_' + Crypto.id(),
             aspectRatio: undefined,
+            dialog: false,
         }
     },
     beforeMount() {
@@ -71,6 +107,9 @@ export default {
         if (!_.isBoolean(this.block.metadata.config.hide_background)) {
             this.block.metadata.config.hide_background = false
         }
+        if (!_.isBoolean(this.block.metadata.config.modal)) {
+            this.block.metadata.config.modal = false
+        }
         if (_.isEmpty(this.block.metadata.config.aria_describedby)) {
             this.block.metadata.config.aria_describedby = ''
         }
@@ -111,8 +150,13 @@ export default {
             }
         },
     },
-    mounted() {},
-    methods: {},
+    methods: {
+        onHandleModal() {
+            if (this.block.metadata.config.modal) {
+                this.dialog = true
+            }
+        },
+    },
 }
 </script>
 

package/components/Content/Blocks/UserUpload.vue

@@ -38,7 +38,7 @@
                         :enrollment="enrollment"
                     ></DisplayUserFilesTable>
                 </v-col>
-                <v-col cols="12">
+                <v-col cols="12" v-if="showUpload">
                     <div v-if="blockExists">
                         <v-form
                             ref="form"
@@ -149,6 +149,7 @@ export default {
             uploadFiles: [],
             userFileAsset: {},
             studentUpload: null,
+            maxFileLimit: 10,
         }
     },
     computed: {
@@ -160,17 +161,27 @@ export default {
         },
         canUpload() {
             if (this.valid) {
+                const currentFiles = _.get(
+                    this.userFileAsset,
+                    'file_assets',
+                    []
+                )
+
                 // Multiple disabled, single file selected
                 if (
                     !Array.isArray(this.uploadFiles) &&
                     !this.block.metadata.config.uploadSettings.multiple &&
-                    this.uploadFiles
+                    this.uploadFiles &&
+                    currentFiles.length === 0
                 ) {
                     return true
                 } else if (
                     // Multi enabled, one or more files selected
+                    this.block.metadata.config.uploadSettings.multiple &&
                     Array.isArray(this.uploadFiles) &&
-                    this.uploadFiles.length > 0
+                    this.uploadFiles.length > 0 &&
+                    this.uploadFiles.length + currentFiles.length <=
+                        this.maxFileLimit
                 ) {
                     return true
                 } else {
@@ -180,6 +191,26 @@ export default {
             }
             return false
         },
+        showUpload() {
+            const currentFiles = _.get(this.userFileAsset, 'file_assets', [])
+
+            // Multiple disabled, confirm there's no current files
+            if (
+                !this.block.metadata.config.uploadSettings.multiple &&
+                currentFiles.length === 0
+            ) {
+                return true
+            } else if (
+                // Multi enabled, make sure we're not over our max limit
+                this.block.metadata.config.uploadSettings.multiple &&
+                currentFiles.length < this.maxFileLimit
+            ) {
+                return true
+            } else {
+                // Hide the uploader
+                return false
+            }
+        },
     },
     mounted() {
         if (this.blockExists) {
@@ -202,19 +233,24 @@ export default {
             }
 
             // Create a new UserFileAsset if we don't have an instance yet
-            if (!Uuid.test(this.userFileAsset.id)) {
-                this.userFileAsset = new UserFileAsset({
-                    file: uploadFiles,
-                }).for(
-                    new Enrollment(this.enrollment),
-                    new ContentBlock({ id: this.block.id })
-                )
+            let userFileAssetRequest = new UserFileAsset({
+                file: uploadFiles,
+            }).for(
+                new Enrollment(this.enrollment),
+                new ContentBlock({ id: this.block.id })
+            )
+
+            // Apply the existing id if we already have an instance
+            if (Uuid.test(this.userFileAsset.id)) {
+                userFileAssetRequest.id = this.userFileAsset.id
             }
 
-            this.userFileAsset.file = uploadFiles
+            // Add our files to upload
+            userFileAssetRequest.file = uploadFiles
 
             try {
-                this.userFileAsset = await this.userFileAsset.save()
+                // Apply the response back to the reactive this.userFileAsset
+                this.userFileAsset = await userFileAssetRequest.save()
             } catch (e) {
                 this.$toast.error(this.$t('shared.forms.errors.unknown'))
                 console.log(e)

package/components/Settings/ClickableIconsSettings.vue

@@ -1,9 +1,10 @@
 <template>
     <div>
-        <v-container>
+        <v-container class="pa-0">
             <v-col class="pa-0">
                 <v-text-field
                     v-model="block.metadata.config.title"
+                    outlined
                     id="title"
                     :label="
                         $t(
@@ -13,6 +14,7 @@
                 ></v-text-field>
                 <v-text-field
                     v-model="block.metadata.config.description"
+                    outlined
                     id="description"
                     :label="
                         $t(
@@ -60,12 +62,8 @@
                         )
                     "
                 ></v-switch>
-                <v-btn color="primary" outlined block @click="onAddElement"
-                    ><v-icon>mdi-plus</v-icon
-                    >{{ $t('shared.forms.add') }}</v-btn
-                >
             </v-col>
-            <v-col>
+            <v-col class="pa-0">
                 <SortableExpansionPanel
                     v-model="block.metadata.config.items"
                     @click:close="onRemoveElement"
@@ -86,47 +84,64 @@
                         </span>
                     </template>
                     <template #body="{ index }">
-                        <TextIconPicker
-                            v-model="block.metadata.config.items[index].icon"
-                            :label="
-                                $t(
-                                    'windward.core.components.settings.clickable_icon.item_icon',
-                                    [index + 1]
-                                )
-                            "
-                        ></TextIconPicker>
-                        <v-text-field
-                            v-model="block.metadata.config.items[index].title"
-                            :id="'item-' + index + '-title'"
-                            :label="
-                                $t(
-                                    'windward.core.components.settings.clickable_icon.item_title'
-                                )
-                            "
-                        ></v-text-field>
+                        <v-container>
+                            <TextIconPicker
+                                v-model="
+                                    block.metadata.config.items[index].icon
+                                "
+                                :label="
+                                    $t(
+                                        'windward.core.components.settings.clickable_icon.item_icon',
+                                        [index + 1]
+                                    )
+                                "
+                            ></TextIconPicker>
+                            <v-text-field
+                                v-model="
+                                    block.metadata.config.items[index].title
+                                "
+                                :id="'item-' + index + '-title'"
+                                outlined
+                                :label="
+                                    $t(
+                                        'windward.core.components.settings.clickable_icon.item_title'
+                                    )
+                                "
+                            ></v-text-field>
 
-                        <ColorPicker
-                            v-if="!block.metadata.config.display.autocolor"
-                            v-model="block.metadata.config.items[index].color"
-                            :label="
+                            <ColorPicker
+                                v-if="!block.metadata.config.display.autocolor"
+                                v-model="
+                                    block.metadata.config.items[index].color
+                                "
+                                :label="
+                                    $t(
+                                        'windward.core.components.settings.clickable_icon.item_color'
+                                    )
+                                "
+                            ></ColorPicker>
+                            <v-divider class="mt-3 mb-3" />
+                            <span>{{
                                 $t(
-                                    'windward.core.components.settings.clickable_icon.item_color'
+                                    'windward.core.components.settings.clickable_icon.item_text'
                                 )
-                            "
-                        ></ColorPicker>
-                        <v-divider class="mt-3 mb-3" />
-                        <span>{{
-                            $t(
-                                'windward.core.components.settings.clickable_icon.item_text'
-                            )
-                        }}</span>
-                        <TextEditor
-                            v-model="block.metadata.config.items[index].body"
-                            :height="200"
-                        ></TextEditor>
+                            }}</span>
+                            <TextEditor
+                                v-model="
+                                    block.metadata.config.items[index].body
+                                "
+                                :height="200"
+                            ></TextEditor>
+                        </v-container>
                     </template>
                 </SortableExpansionPanel>
             </v-col>
+            <v-row justify="center" class="my-4">
+                <v-btn color="primary" @click="onAddElement"
+                    ><v-icon>mdi-plus</v-icon
+                    >{{ $t('shared.forms.add') }}</v-btn
+                >
+            </v-row>
         </v-container>
     </div>
 </template>

package/components/Settings/HorizontalRuleSettings.vue

@@ -0,0 +1,42 @@
+<template>
+    <div>
+        <v-switch
+            v-model="block.metadata.config.dashed"
+            :label="
+                $t('windward.core.components.settings.horizontal_rule.dashed')
+            "
+        ></v-switch>
+    </div>
+</template>
+
+<script>
+import _ from 'lodash'
+import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+
+export default {
+    name: 'HorizontalRuleSettings',
+    extends: BaseContentSettings,
+    components: {},
+    beforeMount() {
+        if (_.isEmpty(this.block)) {
+            this.block = {}
+        }
+        if (_.isEmpty(this.block.metadata)) {
+            this.block.metadata = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (_.isEmpty(this.block.metadata.config)) {
+            this.block.metadata.config = {}
+        }
+        if (!_.isBoolean(this.block.metadata.config.dashed)) {
+            this.block.metadata.config.dashed = false
+        }
+    },
+    data() {
+        return {}
+    },
+}
+</script>
+<style></style>

package/components/Settings/ImageSettings.vue

@@ -23,6 +23,10 @@
                 $t('windward.core.components.settings.image.hide_background')
             "
         ></v-switch>
+        <v-switch
+            v-model="block.metadata.config.modal"
+            :label="$t('windward.core.components.settings.image.modal')"
+        ></v-switch>
 
         <v-form>
             <v-text-field
@@ -79,6 +83,9 @@ export default {
         if (!_.isBoolean(this.block.metadata.config.hide_background)) {
             this.block.metadata.config.hide_background = false
         }
+        if (!_.isBoolean(this.block.metadata.config.modal)) {
+            this.block.metadata.config.modal = false
+        }
         if (_.isEmpty(this.block.metadata.config.aria_describedby)) {
             this.block.metadata.config.aria_describedby = ''
         }

package/components/utils/FillInBlank/FillInBlankInput.vue

@@ -139,8 +139,8 @@ export default {
     computed: {
         answerIsCorrect() {
             if (
-                _.trim(_.toLower(this.answer)) ===
-                _.trim(_.toLower(this.userInput))
+                _.replace(_.trim(_.toLower(this.answer)),new RegExp(' ','g'), '', ) ===
+                _.replace(_.trim(_.toLower(this.userInput)),new RegExp(' ','g'), '', )
             ) {
                 return true
             }

package/components/utils/assets/tinymce/css/content.scss

@@ -1,11 +1,11 @@
 
 table {
     max-width: 100%;
-    border: 1px solid black;
+    border: 1px solid var(--v-primary-base) !important;
     border-spacing: 0;
 
     th, td {
-        border: 1px solid black;
+        border: 1px solid var(--v-primary-base) !important;
         padding: 3px;
     }
 

package/i18n/en-US/components/content/blocks/feedback.ts

@@ -22,10 +22,10 @@ export default {
     sent_feedback:
         'Thank you for submitting feedback. Your input is very important and valuable to us. If you suggested improvements in your comments, we will consider those suggestions seriously. Course quality and usability are our highest priorities.',
     scale: {
-        strongly_agree: 'Stronly Agree',
+        strongly_agree: 'Strongly Agree',
         agree: 'Agree',
         neutral: 'Neutral',
         disagree: 'Disagree',
-        strongly_disagree: 'Strong Disagree',
+        strongly_disagree: 'Strongly Disagree',
     },
 }

package/i18n/en-US/components/settings/horizontal_rule.ts

@@ -0,0 +1,3 @@
+export default {
+    dashed: 'Make line dashed',
+}

package/i18n/en-US/components/settings/image.ts

@@ -1,3 +1,4 @@
 export default {
     hide_background: 'Hide Background',
+    modal: 'Click to open in modal',
 }

package/i18n/en-US/components/settings/index.ts

@@ -10,6 +10,7 @@ import accordion from './accordion'
 import tab from './tab'
 import email from './email'
 import block_quote from './block_quote'
+import horizontal_rule from './horizontal_rule'
 
 export default {
     accordion,
@@ -24,4 +25,5 @@ export default {
     scenario_choice: scenarioChoice,
     email,
     block_quote,
+    horizontal_rule,
 }

package/i18n/en-US/shared/content_blocks.ts

@@ -16,6 +16,7 @@ export default {
         feedback: 'Feedback',
         email: 'Email',
         block_quote: 'Block Quote',
+        horizontal_rule: 'Divider',
     },
     grouping: {
         basic: 'Basic Components',

package/i18n/en-US/shared/settings.ts

@@ -14,6 +14,7 @@ export default {
         table: 'Table Settings',
         math: 'Math Settings',
         feedback: 'Feedback Settings',
+        horizontal_line: 'Divider Settings',
         email: 'Ajustes del correo electrónico',
         click_to_enter: 'Click here to enter text',
         block_quote: 'Block Quote Settings',

package/i18n/es-ES/components/settings/horizontal_rule.ts

@@ -0,0 +1,3 @@
+export default {
+    dashed: 'Hacer línea discontinua',
+}

package/i18n/es-ES/components/settings/image.ts

@@ -1,3 +1,4 @@
 export default {
     hide_background: 'Ocultar fondo',
+    modal: 'Haga clic para abrir en modal',
 }

package/i18n/es-ES/components/settings/index.ts

@@ -10,6 +10,7 @@ import accordion from './accordion'
 import tab from './tab'
 import block_quote from './block_quote'
 import email from './email'
+import horizontal_rule from './horizontal_rule'
 
 export default {
     accordion,
@@ -24,4 +25,5 @@ export default {
     scenario_choice: scenarioChoice,
     block_quote,
     email,
+    horizontal_rule,
 }

package/i18n/es-ES/shared/content_blocks.ts

@@ -16,6 +16,7 @@ export default {
         feedback: 'Comentarios',
         email: 'Correo Electrónico',
         block_quote: 'Cotización en bloque',
+        horizontal_rule: 'Divisor',
     },
     grouping: {
         basic: 'Componentes básicos',

package/i18n/es-ES/shared/settings.ts

@@ -16,6 +16,7 @@ export default {
         table: 'Configuración de la tabla',
         math: 'Configuración matemática',
         feedback: 'Configuración de comentarios',
+        horizontal_line: 'Configuración del divisor',
         email: 'Ajustes del correo electrónico',
         click_to_enter: 'Haga clic para ingresar texto',
         block_quote: 'Configuración de cotización en bloque',

package/i18n/sv-SE/components/settings/horizontal_rule.ts

@@ -0,0 +1,3 @@
+export default {
+    dashed: 'Göra streckad linje',
+}

package/i18n/sv-SE/components/settings/image.ts

@@ -1,3 +1,4 @@
 export default {
     hide_background: 'Dölj bakgrund',
+    modal: 'Klicka för att öppna i modal',
 }

package/i18n/sv-SE/components/settings/index.ts

@@ -10,6 +10,7 @@ import accordion from './accordion'
 import tab from './tab'
 import block_quote from './block_quote'
 import email from './email'
+import horizontal_rule from './horizontal_rule'
 
 export default {
     accordion,
@@ -24,4 +25,5 @@ export default {
     scenario_choice: scenarioChoice,
     block_quote,
     email,
+    horizontal_rule,
 }

package/i18n/sv-SE/shared/content_blocks.ts

@@ -16,6 +16,7 @@ export default {
         feedback: 'Feedback',
         email: 'E-Post',
         block_quote: 'Block citat',
+        horizontal_rule: 'Delare',
     },
     grouping: {
         basic: 'Basic Components',

package/i18n/sv-SE/shared/settings.ts

@@ -14,6 +14,7 @@ export default {
         table: 'Tabellinställningar',
         math: 'Matematiska inställningar',
         feedback: 'Feedback-inställningar',
+        horizontal_line: 'Inställningar för avdelare',
         email: 'E-postinställningar',
         click_to_enter: 'Klicka för att skriva in text',
         block_quote: 'Blockera offertinställningar',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/core",
-    "version": "0.1.2",
+    "version": "0.1.4",
     "description": "Windward UI Core Plugins",
     "main": "plugin.js",
     "scripts": {

package/plugin.js

@@ -11,6 +11,7 @@ import ClickableIcons from './components/Content/Blocks/ClickableIcons'
 import ScenarioChoice from './components/Content/Blocks/ScenarioChoice'
 import Email from './components/Content/Blocks/Email'
 import BlockQuote from './components/Content/Blocks/BlockQuote.vue'
+import HorizontalRule from './components/Content/Blocks/HorizontalRule.vue'
 
 import UserUploadNav from './components/Navigation/Items/UserUploadNav.vue'
 
@@ -37,6 +38,7 @@ import TabSettings from './components/Settings/TabSettings.vue'
 import FeedbackSettings from './components/Settings/FeedbackSettings.vue'
 import EmailSettings from './components/Settings/EmailSettings.vue'
 import BlockQuoteSettigns from './components/Settings/BlockQuoteSettings.vue'
+import HorizontalRuleSettings from './components/Settings/HorizontalRuleSettings.vue'
 
 import UserUploadPage from './pages/userUpload.vue'
 import GlossaryToolTip from './components/utils/glossary/GlossaryToolTip.vue'
@@ -165,16 +167,6 @@ export default {
                         'windward.core.shared.content_blocks.grouping.basic',
                 },
             },
-            {
-                tag: 'core-math',
-                template: Math,
-                metadata: {
-                    icon: 'mdi-math-integral',
-                    name: 'windward.core.shared.content_blocks.title.math',
-                    grouping:
-                        'windward.core.shared.content_blocks.grouping.basic',
-                },
-            },
             {
                 tag: 'core-accordion',
                 template: Accordion,
@@ -262,7 +254,7 @@ export default {
                     icon: 'mdi-email',
                     name: 'windward.core.shared.content_blocks.title.email',
                     grouping:
-                    'windward.core.shared.content_blocks.grouping.basic',
+                        'windward.core.shared.content_blocks.grouping.basic',
                 },
             },
             {
@@ -275,6 +267,16 @@ export default {
                         'windward.core.shared.content_blocks.grouping.basic',
                 },
             },
+            {
+                tag: 'core-horizontal-rule',
+                template: HorizontalRule,
+                metadata: {
+                    icon: 'mdi-minus',
+                    name: 'windward.core.shared.content_blocks.title.horizontal_rule',
+                    grouping:
+                        'windward.core.shared.content_blocks.grouping.basic',
+                },
+            },
         ],
         settings: [
             {
@@ -376,15 +378,6 @@ export default {
                     name: 'windward.core.shared.settings.title.text_editor',
                 },
             },
-            {
-                tag: 'core-math-settings',
-                template: MathSettings,
-                context: ['block.core-math'],
-                metadata: {
-                    icon: 'mdi-notebook-outline',
-                    name: 'windward.core.shared.settings.title.math',
-                },
-            },
             {
                 tag: 'core-feedback-settings',
                 template: FeedbackSettings,
@@ -412,6 +405,15 @@ export default {
                     name: 'windward.core.shared.settings.title.block_quote',
                 },
             },
+            {
+                tag: 'core-horizontal-rule-settings',
+                template: HorizontalRuleSettings,
+                context: ['block.core-horizontal-rule'],
+                metadata: {
+                    icon: 'mdi-cog',
+                    name: 'windward.core.shared.settings.title.horizontal_line',
+                },
+            },
         ],
     },
 }

package/test/Components/Settings/EmailSettings.spec.js

@@ -27,8 +27,8 @@ describe('EmailSettings', () => {
         })
         wrapper.vm.onAddElement()
         expect(wrapper.vm.$data.block.metadata.config.emails).toEqual([
-            { from: '', to: '', cc: '', body: '', expand: false },
-            { from: '', to: '', cc: '', body: '', expand: false },
+            { from: '', to: '', cc: '', body: '', expand: false, initials: '' },
+            { from: '', to: '', cc: '', body: '', expand: false, initials: '' },
         ])
     })
 

package/test/helpers/MathHelper.spec.js

@@ -7,7 +7,7 @@ const text =
     ' Et inventore hic aut.'
 const mathML =
     '<math xmlns="http://www.w3.org/1998/Math/MathML"><mfrac><mn>1</mn><mn>2</mn></mfrac><mo>+</mo><mfrac><mn>3</mn><mn>4</mn></mfrac></math>'
-const latexContent = '\\frac{1}{2}+\\frac{3}{4}'
+const latexContent = '\\frac{1}{2} + \\frac{3}{4}'
 const srEnhancedlatex =
     '**' +
     JSON.stringify({