@windward/core 0.5.0 → 0.5.2

package/components/Content/Blocks/BlockQuote.vue

@@ -21,17 +21,18 @@
             </v-col>
             <v-col cols="11" class="pl-0">
                 <p class="pt-2">
-                    {{ block.metadata.config.block_quote.quote }}
+                    <TextViewer
+                        v-model="block.metadata.config.block_quote.quote"
+                    ></TextViewer>
                 </p>
             </v-col>
         </v-row>
         <v-row>
             <v-col cols="12">
-                <p v-if="render">
-                    {{ finalcitation
-                    }}<span :class="classCitation">{{ finalsource }}</span>
+                <p>
+                    {{ citation }}
+                    <span :class="sourceClass">{{ source }}</span>
                 </p>
-                <p v-if="!render">Citation Here</p>
             </v-col>
         </v-row>
     </v-container>
@@ -39,6 +40,9 @@
 
 <script>
 import _ from 'lodash'
+import he from 'he'
+
+import TextViewer from '~/components/Text/TextViewer.vue'
 import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
 
 export default {
@@ -68,6 +72,7 @@ export default {
                 organization: '',
                 source_title: '',
                 source_type: '',
+                source_url: '',
             }
         }
         this.block.body = this.$t(
@@ -75,108 +80,86 @@ export default {
         )
     },
     data() {
-        return {
-            finalcitation: '',
-            finalsource: '',
-            classCitation: '',
-        }
+        return {}
     },
-    watch: {
-        render(newValue) {
-            if (newValue) {
-                this.createCitation()
+    computed: {
+        citation() {
+            const parts = []
+
+            // List of all keys in `block.metadata.config.block_quote.x` to include in the citation
+            const keys = ['author', 'author_title', 'organization']
+
+            // Go over all citation keys to compile
+            for (const key of keys) {
+                const value = this.block.metadata.config.block_quote[key] || ''
+
+                if (value) {
+                    parts.push(value)
+                }
+            }
+
+            // If there were parts to return then prepend with a mdash
+            if (parts.length > 0) {
+                return he.decode('&mdash;') + parts.join(', ')
+            } else {
+                return ''
             }
         },
-    },
-    mounted() {
-        this.createCitation()
-    },
-    methods: {
-        createCitation() {
-            this.finalcitation = ''
-            this.finalsource = ''
-            let counter = 0
-            for (const property in this.block.metadata.config.block_quote) {
-                // author details processed here counter added to see if a comma is needed before key
-                if (
-                    property !== 'quote' &&
-                    property !== 'source_type' &&
-                    property !== 'source_title' &&
-                    this.block.metadata.config.block_quote[property] !== null &&
-                    this.block.metadata.config.block_quote[property] !== ''
-                ) {
-                    if (counter > 0) {
-                        //not first hit so a comma is needed before key
-                        counter = counter + 1
-                        this.finalcitation =
-                            this.finalcitation +
-                            ', ' +
-                            this.block.metadata.config.block_quote[property]
-                    } else {
-                        //first hit, no comma needed
-                        counter = counter + 1
-                        this.finalcitation =
-                            '—' +
-                            this.finalcitation +
-                            this.block.metadata.config.block_quote[property]
-                    }
-                    // checks that source_type isn't none and there is a source title
-                } else if (
-                    property === 'source_title' &&
-                    this.block.metadata.config.block_quote['source_type'] !==
-                        'None' &&
-                    this.block.metadata.config.block_quote[property] !== null &&
-                    this.block.metadata.config.block_quote[property] !== ''
-                ) {
-                    // filters out source types book. Adds class to italicize books
-                    if (
-                        this.block.metadata.config.block_quote[
-                            'source_type'
-                        ] === 'Book'
-                    ) {
-                        // checks if comma needed or not
-                        if (counter > 0) {
-                            this.finalsource =
-                                ', ' +
-                                this.block.metadata.config.block_quote[property]
-                            this.classCitation = 'span-title'
-                        } else {
-                            this.finalsource =
-                                '—' +
-                                this.block.metadata.config.block_quote[property]
-                            this.classCitation = 'span-title'
-                        }
-                        //checks if online journal
-                    } else if (
-                        this.block.metadata.config.block_quote[
-                            'source_type'
-                        ] === 'Online Journal'
-                    ) {
-                        // checks if comma needed or not. Not Italicized
-                        if (counter > 0) {
-                            this.finalsource =
-                                ', ' +
-                                '"' +
-                                this.block.metadata.config.block_quote[
-                                    property
-                                ] +
-                                '"'
-                            this.classCitation = ''
-                        } else {
-                            this.finalsource =
-                                '—' +
-                                '"' +
+        source() {
+            const parts = []
+
+            const sourceTitle =
+                this.block.metadata.config.block_quote['source_title'] || ''
+            const sourceType =
+                this.block.metadata.config.block_quote['source_type'] || ''
+
+            if (sourceTitle && sourceType) {
+                switch (sourceType) {
+                    case 'online_journal':
+                        // Wrap the sourceTitle for online journals in quotes
+                        parts.push('"' + sourceTitle + '"')
+
+                        // For online journals also add the url if it exists
+                        if (
+                            this.block.metadata.config.block_quote['source_url']
+                        ) {
+                            parts.push(
                                 this.block.metadata.config.block_quote[
-                                    property
-                                ] +
-                                '"'
-                            this.classCitation = ''
+                                    'source_url'
+                                ]
+                            )
                         }
-                    }
+                        break
+                    default:
+                        // Book sources are not wrapped
+                        parts.push(sourceTitle)
+                        break
                 }
             }
+
+            // If the citation is empty (aka we only have sources)
+            // and there's sources then prepend with a mdash
+            if (parts.length > 0 && this.citation === '') {
+                return he.decode('&mdash;') + parts.join(', ')
+            } else if (parts.length > 0) {
+                // Otherwise there's a citation / no sources. Don't prepend with mdash
+                return parts.join(', ')
+            } else {
+                return ''
+            }
+        },
+        sourceClass() {
+            if (
+                this.block.metadata.config.block_quote['source_title'] &&
+                this.block.metadata.config.block_quote['source_type'] &&
+                this.block.metadata.config.block_quote['source_type'] === 'book'
+            ) {
+                return 'span-title'
+            }
         },
     },
+    mounted() {},
+    methods: {},
 }
 </script>
 

package/components/Content/Blocks/Video.vue

@@ -24,6 +24,9 @@
         <h2 v-if="block.metadata.config.title">
             {{ block.metadata.config.title }}
         </h2>
+        <p v-if="block.metadata.config.description" class="pb-0 mb-0">
+            {{ block.metadata.config.description }}
+        </p>
         <VuetifyPlayer
             v-if="hasSource"
             :language="$i18n && $i18n.locale ? $i18n.locale : 'en-US'"
@@ -161,6 +164,8 @@ export default {
             fileTab: null,
             // Default config settings
             defaultConfig: {
+                title: '',
+                description: '',
                 // Default settings for new blocks
                 // This will be overridden in beforeMount()
                 type: 'video', // Allowed video|audio. In audio mode the player has a max-height of 40px

package/components/Settings/BlockQuoteSettings.vue

@@ -22,16 +22,14 @@
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
         <v-container class="pa-0">
-            <v-textarea
+            <TextEditor
                 v-model="block.metadata.config.block_quote.quote"
-                outlined
-                auto-grow
-                :counter="255"
+                :height="200"
                 :label="
                     $t('windward.core.components.settings.block_quote.body')
                 "
                 :disabled="render"
-            ></v-textarea>
+            ></TextEditor>
         </v-container>
         <v-divider class="my-4 primary"></v-divider>
         <v-container class="pa-0">
@@ -80,6 +78,21 @@
                 "
                 :disabled="render"
             ></v-select>
+            <v-text-field
+                v-if="
+                    block.metadata.config.block_quote.source_type ===
+                    'online_journal'
+                "
+                v-model="block.metadata.config.block_quote.source_url"
+                outlined
+                auto-grow
+                :label="
+                    $t(
+                        'windward.core.components.settings.block_quote.source_url'
+                    )
+                "
+                :disabled="render"
+            ></v-text-field>
         </v-container>
         <div v-if="loading" class="text-center">
             <v-progress-circular
@@ -93,11 +106,13 @@
 </template>
 <script>
 import _ from 'lodash'
+import TextEditor from '~/components/Text/TextEditor.vue'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
 
 export default {
     name: 'BlockQuoteSettings',
     extends: BaseContentSettings,
+    components: { TextEditor },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -122,6 +137,7 @@ export default {
                 organization: '',
                 source_title: '',
                 source_type: '',
+                source_url: '',
             }
         }
         this.block.body = this.$t(
@@ -132,15 +148,29 @@ export default {
         return {
             valid: true,
             loading: false,
-            sourceTypes: ['None', 'Book', 'Online Journal'],
-        }
-    },
-    beforeDestroy() {
-        if (this.debouncer) {
-            clearTimeout(this.debouncer)
+            sourceTypes: [
+                {
+                    text: this.$t(
+                        'windward.core.components.settings.block_quote.source_types.none'
+                    ),
+                    value: '',
+                },
+
+                {
+                    text: this.$t(
+                        'windward.core.components.settings.block_quote.source_types.book'
+                    ),
+                    value: 'book',
+                },
+                {
+                    text: this.$t(
+                        'windward.core.components.settings.block_quote.source_types.online_journal'
+                    ),
+                    value: 'online_journal',
+                },
+            ],
         }
     },
-
     methods: {},
 }
 </script>

package/components/Settings/VideoSettings.vue

@@ -7,6 +7,19 @@
                     :label="$t('windward.core.components.settings.video.title')"
                     :disabled="render"
                 ></v-text-field>
+                <v-textarea
+                    v-model="block.metadata.config.description"
+                    outlined
+                    auto-grow
+                    :counter="255"
+                    :label="
+                        $t(
+                            'components.content.settings.base.description_optional'
+                        )
+                    "
+                    :disabled="render"
+                ></v-textarea>
+
                 <h4 class="mb-3">
                     {{ $t('windward.core.components.settings.video.sources') }}
                 </h4>
@@ -465,7 +478,7 @@
 <script>
 import _ from 'lodash'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
-import Uuid from '~/helpers/Uuid'
+
 export default {
     name: 'VideoSettings',
     extends: BaseContentSettings,

package/components/utils/TinyMCEWrapper.vue

@@ -538,7 +538,6 @@ export default {
 <style lang="scss" scoped>
 .editor-label {
     font-size: 1rem;
-    margin-top: -1rem;
     display: block;
     transform-origin: top left;
     transform: scale(0.75);

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

@@ -6,4 +6,10 @@ export default {
     org: 'Organization',
     source_title: 'Source Title',
     type: 'Source Type',
+    source_url: 'Source Url',
+    source_types: {
+        none: 'None',
+        book: 'Book',
+        online_journal: 'Online Journal',
+    },
 }

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

@@ -4,6 +4,12 @@ export default {
     name: 'Nombre',
     title: 'Título',
     org: 'Organización',
-    source_title: 'Título de la fuente' ,
+    source_title: 'Título de la fuente',
     type: 'Tipo de fuente',
+    source_url: 'URL de origen',
+    source_types: {
+        none: 'Ninguno',
+        book: 'Libro',
+        online_journal: 'Diario en línea',
+    },
 }

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

@@ -4,6 +4,12 @@ export default {
     name: 'Namn',
     title: 'Titel',
     org: 'Organisation',
-    source_title: 'Källtitel' ,
+    source_title: 'Källtitel',
     type: 'Källtyp',
+    source_url: 'Källa URL',
+    source_types: {
+        none: 'Ingen',
+        book: 'Bok',
+        online_journal: 'Online Journal',
+    },
 }

package/package.json

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

package/.idea/codeStyles/Project.xml

@@ -1,58 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/windward-ui-plugin-core.iml" filepath="$PROJECT_DIR$/.idea/windward-ui-plugin-core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/php-docker-settings.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PhpDockerContainerSettings">
-    <list>
-      <map>
-        <entry key="79d59a8f-c56c-4789-b96c-e55a326ab125">
-          <value>
-            <DockerContainerSettings>
-              <option name="version" value="1" />
-              <option name="volumeBindings">
-                <list>
-                  <DockerVolumeBindingImpl>
-                    <option name="containerPath" value="/opt/project" />
-                    <option name="hostPath" value="$PROJECT_DIR$" />
-                  </DockerVolumeBindingImpl>
-                </list>
-              </option>
-            </DockerContainerSettings>
-          </value>
-        </entry>
-      </map>
-    </list>
-  </component>
-</project>

package/.idea/php.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="highlightLevel" value="WARNING" />
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PhpStanOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PsalmOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

package/.idea/watcherTasks.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectTasksOptions" suppressed-tasks="SCSS" />
-</project>

package/.idea/windward-ui-plugin-core.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>