@windward/core 0.2.3 → 0.4.0

package/components/Settings/AccordionSettings.vue

@@ -10,6 +10,7 @@
                 </p>
                 <SortableExpansionPanel
                     v-model="block.metadata.config.items"
+                    :disabled="render"
                     @click:close="onRemoveElement($event)"
                     @change="onDragged"
                     @update:currentPanel="onUpdatePanel"
@@ -34,15 +35,17 @@
                                         'windward.core.shared.settings.title.title'
                                     )
                                 "
+                                :disabled="render"
                                 @focus="onTextAreaFocus"
                             ></v-text-field>
                             <v-btn
+                                text
+                                :disabled="render"
                                 @click="
                                     onToggleExpand(
                                         block.metadata.config.items[index]
                                     )
                                 "
-                                text
                             >
                                 <v-icon
                                     v-if="
@@ -74,14 +77,65 @@
                                         'windward.core.components.settings.accordion.label'
                                     )
                                 "
+                                :disabled="render"
                             ></TextEditor>
+                            <v-container class="pa-0 pt-3">
+                                <h4>
+                                    {{
+                                        $t(
+                                            'windward.core.shared.settings.upload_file'
+                                        )
+                                    }}
+                                </h4>
+                                <v-text-field
+                                    v-model="
+                                        block.metadata.config.items[index]
+                                            .altText
+                                    "
+                                    class="pt-3 pb-3"
+                                    :hide-details="true"
+                                    dense
+                                    outlined
+                                    :autofocus="true"
+                                    :label="
+                                        $t(
+                                            'windward.core.shared.settings.alt_image'
+                                        )
+                                    "
+                                ></v-text-field>
+                                <v-text-field
+                                    v-model="
+                                        block.metadata.config.items[index]
+                                            .ariaDescribedBy
+                                    "
+                                    class="pt-3 pb-3"
+                                    :hide-details="true"
+                                    dense
+                                    outlined
+                                    :label="
+                                        $t(
+                                            'windward.core.shared.settings.aria_described'
+                                        )
+                                    "
+                                ></v-text-field>
+                                <ContentBlockAsset
+                                    v-model="
+                                        block.metadata.config.items[index].file
+                                    "
+                                    mimes="image/png,image/jpeg"
+                                    :assets.sync="block.assets"
+                                ></ContentBlockAsset>
+                            </v-container>
                         </v-container>
                     </template>
                 </SortableExpansionPanel>
             </v-container>
             <v-container class="pa-0">
                 <v-row justify="center" class="my-4">
-                    <v-btn color="primary" @click="onAddElement"
+                    <v-btn
+                        color="primary"
+                        :disabled="render"
+                        @click="onAddElement"
                         ><v-icon>mdi-plus</v-icon
                         >{{
                             $t(
@@ -105,9 +159,9 @@
 <script>
 import _ from 'lodash'
 import Crypto from '~/helpers/Crypto'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import TextEditor from '~/components/Text/TextEditor'
-import SortableExpansionPanel from '~/components/SortableExpansionPanel.vue'
+import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
 
 export default {
     name: 'AccordionSettings',
@@ -134,6 +188,9 @@ export default {
                 header: '',
                 expand: false,
                 content: '',
+                file: null,
+                altText: '',
+                ariaDescribedBy: '',
             }
             this.block.metadata.config.items = []
             this.block.metadata.config.items.push(defaultObject)
@@ -173,6 +230,9 @@ export default {
                 header: '',
                 expand: false,
                 content: '',
+                file: null,
+                altText: '',
+                ariaDescribedBy: '',
             }
             this.block.metadata.config.items.push(default_item)
             this.block.metadata.config.selectedPanels =

package/components/Settings/BlockQuoteSettings.vue

@@ -9,6 +9,7 @@
                 :autofocus="true"
                 :label="$t('windward.core.shared.settings.title.title')"
                 ref="title"
+                :disabled="render"
             ></v-text-field>
             <v-textarea
                 v-model="block.metadata.config.instructions"
@@ -16,6 +17,7 @@
                 auto-grow
                 :counter="255"
                 :label="$t('windward.core.shared.settings.title.instructions')"
+                :disabled="render"
             ></v-textarea>
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
@@ -28,6 +30,7 @@
                 :label="
                     $t('windward.core.components.settings.block_quote.body')
                 "
+                :disabled="render"
             ></v-textarea>
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
@@ -39,6 +42,7 @@
                 :label="
                     $t('windward.core.components.settings.block_quote.name')
                 "
+                :disabled="render"
             ></v-text-field>
             <v-text-field
                 v-model="block.metadata.config.block_quote.author_title"
@@ -47,12 +51,14 @@
                 :label="
                     $t('windward.core.components.settings.block_quote.title')
                 "
+                :disabled="render"
             ></v-text-field>
             <v-text-field
                 v-model="block.metadata.config.block_quote.organization"
                 outlined
                 auto-grow
                 :label="$t('windward.core.components.settings.block_quote.org')"
+                :disabled="render"
             ></v-text-field>
             <v-text-field
                 v-model="block.metadata.config.block_quote.source_title"
@@ -63,6 +69,7 @@
                         'windward.core.components.settings.block_quote.source_title'
                     )
                 "
+                :disabled="render"
             ></v-text-field>
             <v-select
                 v-model="block.metadata.config.block_quote.source_type"
@@ -71,6 +78,7 @@
                 :label="
                     $t('windward.core.components.settings.block_quote.type')
                 "
+                :disabled="render"
             ></v-select>
         </v-container>
         <div v-if="loading" class="text-center">
@@ -85,7 +93,7 @@
 </template>
 <script>
 import _ from 'lodash'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 
 export default {
     name: 'BlockQuoteSettings',

package/components/Settings/ClickableIconsSettings.vue

@@ -11,6 +11,7 @@
                             'windward.core.components.settings.clickable_icon.title'
                         )
                     "
+                    :disabled="render"
                 ></v-text-field>
                 <v-text-field
                     v-model="block.metadata.config.description"
@@ -21,6 +22,7 @@
                             'windward.core.components.settings.clickable_icon.description'
                         )
                     "
+                    :disabled="render"
                 ></v-text-field>
                 <v-switch
                     v-model="block.metadata.config.display.show_title"
@@ -29,6 +31,7 @@
                             'windward.core.components.settings.clickable_icon.display.show_title'
                         )
                     "
+                    :disabled="render"
                 ></v-switch>
                 <v-switch
                     v-model="block.metadata.config.display.show_background"
@@ -37,6 +40,7 @@
                             'windward.core.components.settings.clickable_icon.display.show_background'
                         )
                     "
+                    :disabled="render"
                 ></v-switch>
                 <v-switch
                     v-model="block.metadata.config.display.round_icon"
@@ -45,6 +49,7 @@
                             'windward.core.components.settings.clickable_icon.display.round_icon'
                         )
                     "
+                    :disabled="render"
                 ></v-switch>
                 <v-switch
                     v-model="block.metadata.config.display.italic_icon"
@@ -53,6 +58,16 @@
                             'windward.core.components.settings.clickable_icon.display.italic_icon'
                         )
                     "
+                    :disabled="render"
+                ></v-switch>
+                <v-switch
+                    v-model="block.metadata.config.display.large_icon"
+                    :label="
+                        $t(
+                            'windward.core.components.settings.clickable_icon.display.large_icon'
+                        )
+                    "
+                    :disabled="render"
                 ></v-switch>
                 <v-switch
                     v-model="block.metadata.config.display.autocolor"
@@ -61,20 +76,35 @@
                             'windward.core.components.settings.clickable_icon.autocolor'
                         )
                     "
+                    :disabled="render"
                 ></v-switch>
             </v-col>
             <v-col class="pa-0">
                 <SortableExpansionPanel
                     v-model="block.metadata.config.items"
+                    :disabled="render"
                     @click:close="onRemoveElement"
                 >
                     <template #header="{ item }">
-                        <v-icon v-if="item.icon && isIcon(item.icon)">{{
-                            item.icon
-                        }}</v-icon>
-                        <span v-else-if="item.icon && !isIcon(item.icon)">{{
-                            item.icon
-                        }}</span>
+                        <v-avatar v-if="item.iconImage && item.iconAsset">
+                            <v-img :src="getImagePublicUrl(item.iconAsset)" />
+                        </v-avatar>
+                        <v-icon
+                            v-else-if="
+                                !item.iconImage &&
+                                item.icon &&
+                                isIcon(item.icon)
+                            "
+                            >{{ item.icon }}</v-icon
+                        >
+                        <span
+                            v-else-if="
+                                !item.iconImage &&
+                                item.icon &&
+                                !isIcon(item.icon)
+                            "
+                            >{{ item.icon }}</span
+                        >
                         <span v-else class="font-italic">
                             {{
                                 $t(
@@ -85,7 +115,24 @@
                     </template>
                     <template #body="{ index }">
                         <v-container>
+                            <v-switch
+                                v-model="
+                                    block.metadata.config.items[index].iconImage
+                                "
+                                :label="
+                                    $t(
+                                        'windward.core.components.settings.clickable_icon.icon_image'
+                                    )
+                                "
+                                @click="onClickToggleIconImage(index)"
+                                :disabled="render"
+                            ></v-switch>
+
                             <TextIconPicker
+                                v-if="
+                                    !block.metadata.config.items[index]
+                                        .iconImage
+                                "
                                 v-model="
                                     block.metadata.config.items[index].icon
                                 "
@@ -95,7 +142,22 @@
                                         [index + 1]
                                     )
                                 "
+                                :disabled="render"
                             ></TextIconPicker>
+
+                            <ContentBlockAsset
+                                v-if="
+                                    block.metadata.config.items[index].iconImage
+                                "
+                                v-model="
+                                    block.metadata.config.items[index].iconAsset
+                                "
+                                :assets.sync="block.assets"
+                                class="mb-4"
+                                mimes="image/jpeg,image/png,image/gif"
+                                :disabled="render"
+                                @click:file="onFileSelect($event, index)"
+                            ></ContentBlockAsset>
                             <v-text-field
                                 v-model="
                                     block.metadata.config.items[index].title
@@ -107,8 +169,8 @@
                                         'windward.core.components.settings.clickable_icon.item_title'
                                     )
                                 "
+                                :disabled="render"
                             ></v-text-field>
-
                             <ColorPicker
                                 v-if="!block.metadata.config.display.autocolor"
                                 v-model="
@@ -119,6 +181,7 @@
                                         'windward.core.components.settings.clickable_icon.item_color'
                                     )
                                 "
+                                :disabled="render"
                             ></ColorPicker>
                             <v-divider class="mt-3 mb-3" />
                             <span>{{
@@ -131,13 +194,14 @@
                                     block.metadata.config.items[index].body
                                 "
                                 :height="200"
+                                :disabled="render"
                             ></TextEditor>
                         </v-container>
                     </template>
                 </SortableExpansionPanel>
             </v-col>
             <v-row justify="center" class="my-4">
-                <v-btn color="primary" @click="onAddElement"
+                <v-btn color="primary" :disabled="render" @click="onAddElement"
                     ><v-icon>mdi-plus</v-icon
                     >{{ $t('shared.forms.add') }}</v-btn
                 >
@@ -147,11 +211,12 @@
 </template>
 <script>
 import _ from 'lodash'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import TextEditor from '~/components/Text/TextEditor'
-import TextIconPicker from '~/components/TextIconPicker.vue'
-import ColorPicker from '~/components/ColorPicker.vue'
-import SortableExpansionPanel from '~/components/SortableExpansionPanel.vue'
+import TextIconPicker from '~/components/Core/TextIconPicker.vue'
+import ColorPicker from '~/components/Core/ColorPicker.vue'
+import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
+import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 
 export default {
     name: 'ClickableIconsSettings',
@@ -160,6 +225,7 @@ export default {
         TextEditor,
         TextIconPicker,
         ColorPicker,
+        ContentBlockAsset,
     },
     extends: BaseContentSettings,
 
@@ -171,7 +237,9 @@ export default {
             this.block = {}
         }
         if (_.isEmpty(this.block.body)) {
-            this.block.body = this.$t('windward.core.shared.content_blocks.title.clickable_icons')
+            this.block.body = this.$t(
+                'windward.core.shared.content_blocks.title.clickable_icons'
+            )
         }
         if (_.isEmpty(this.block.metadata)) {
             this.block.metadata = {}
@@ -188,6 +256,7 @@ export default {
                 show_background: false,
                 round_icon: false,
                 italic_icon: false,
+                large_icon: false,
                 autocolor: true,
             }
         }
@@ -204,6 +273,8 @@ export default {
         onAddElement() {
             const defaultObject = {
                 icon: '',
+                iconAsset: null,
+                iconImage: false,
                 title: '',
                 body: '<p></p>',
                 color: {
@@ -219,6 +290,26 @@ export default {
         isIcon(str) {
             return str && _.isString(str) && str.indexOf('mdi-') === 0
         },
+        getImagePublicUrl(fileAssetId) {
+            const foundAsset = this.resolveAsset(fileAssetId)
+
+            return _.get(foundAsset, 'asset.public_url', null)
+        },
+        onClickToggleIconImage(index) {
+            // We're switching between images / text. Clear the relevant fields
+            this.block.metadata.config.items[index].icon = ''
+            this.block.metadata.config.items[index].iconAsset = null
+        },
+        onFileSelect(file, index) {
+            // file = null when you remove a file
+            if (_.isEmpty(file)) {
+                this.block.metadata.config.items[index].icon = null
+            } else {
+                this.block.assets.push(file)
+                this.block.metadata.config.items[index].icon =
+                    file.file_asset_id
+            }
+        },
     },
 }
 </script>

package/components/Settings/EmailSettings.vue

@@ -3,12 +3,13 @@
         <v-form ref="form" v-model="valid" v-if="!loading"> </v-form>
         <v-container class="pa-0">
             <v-text-field
+                ref="title"
                 v-model="block.metadata.config.title"
                 outlined
                 :counter="50"
                 :autofocus="true"
                 :label="$t('windward.core.shared.settings.title.title')"
-                ref="title"
+                :disabled="render"
             ></v-text-field>
             <v-textarea
                 v-model="block.metadata.config.instructions"
@@ -16,6 +17,7 @@
                 auto-grow
                 :counter="255"
                 :label="$t('windward.core.shared.settings.title.instructions')"
+                :disabled="render"
             ></v-textarea>
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
@@ -23,6 +25,7 @@
             <p>{{ $t('windward.core.components.settings.email.items') }}</p>
             <SortableExpansionPanel
                 v-model="block.metadata.config.emails"
+                :disabled="render"
                 @click:close="onRemoveElement($event)"
                 @change="onDragged"
                 @update:currentPanel="onUpdatePanel"
@@ -45,6 +48,7 @@
                                     'windward.core.components.settings.email.from'
                                 )
                             "
+                            :disabled="render"
                         ></v-text-field>
                         <v-text-field
                             v-model="block.metadata.config.emails[index].to"
@@ -52,6 +56,7 @@
                             :label="
                                 $t('windward.core.components.settings.email.to')
                             "
+                            :disabled="render"
                         ></v-text-field>
                         <v-text-field
                             v-model="block.metadata.config.emails[index].cc"
@@ -59,6 +64,7 @@
                             :label="
                                 $t('windward.core.components.settings.email.cc')
                             "
+                            :disabled="render"
                         ></v-text-field>
                         <v-text-field
                             v-model="
@@ -70,6 +76,7 @@
                                     'windward.core.components.settings.email.subject'
                                 )
                             "
+                            :disabled="render"
                         ></v-text-field>
                         <v-btn
                             @click="
@@ -79,6 +86,7 @@
                                 )
                             "
                             text
+                            :disabled="render"
                         >
                             <v-icon
                                 v-if="
@@ -109,6 +117,7 @@
                                     'windward.core.components.settings.email.placeholder'
                                 )
                             "
+                            :disabled="render"
                         ></TextEditor>
                     </v-container>
                 </template>
@@ -116,7 +125,7 @@
         </v-container>
         <v-container class="pa-0">
             <v-row justify="center" class="my-4">
-                <v-btn color="primary" @click="onAddElement"
+                <v-btn color="primary" :disabled="render" @click="onAddElement"
                     ><v-icon>mdi-plus</v-icon
                     >{{
                         $t('windward.core.components.settings.email.add')
@@ -137,9 +146,9 @@
 <script>
 import _ from 'lodash'
 import Crypto from '~/helpers/Crypto'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import TextEditor from '~/components/Text/TextEditor'
-import SortableExpansionPanel from '~/components/SortableExpansionPanel.vue'
+import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
 
 export default {
     name: 'EmailSettings',
@@ -201,15 +210,6 @@ export default {
         this.block.metadata.config.selectedPanels = 0
     },
     methods: {
-        onBeforeSave() {
-            this.block.metadata.config.emails.forEach((element) => {
-                if (element.from) {
-                    let matches = element.from.match(/\b(\w)/g)
-                    element.initials = matches.join('')
-                }
-                element.tinymce_expand = false
-            })
-        },
         onUpdatePanel($event) {
             if ($event !== this.block.metadata.config.selectedPanels) {
                 //catch click event to open selected panel to edit

package/components/Settings/FeedbackSettings.vue

@@ -13,6 +13,7 @@
                             outlined
                             v-bind="attrs"
                             v-on="on"
+                            :disabled="render"
                             @click="onPresetChoose(preset)"
                         >
                             <span>
@@ -29,7 +30,7 @@
 
 <script>
 import _ from 'lodash'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 import { mapGetters } from 'vuex'
 
 import SurveyTemplate from '../../models/SurveyTemplate'

package/components/Settings/HorizontalRuleSettings.vue

@@ -5,13 +5,14 @@
             :label="
                 $t('windward.core.components.settings.horizontal_rule.dashed')
             "
+            :disabled="render"
         ></v-switch>
     </div>
 </template>
 
 <script>
 import _ from 'lodash'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 
 export default {
     name: 'HorizontalRuleSettings',