@windward/core 0.4.3 → 0.5.1

package/components/Settings/UserUploadSettings.vue

@@ -1,5 +1,33 @@
 <template>
     <div>
+        <v-text-field
+            v-model="block.metadata.config.title"
+            outlined
+            :counter="50"
+            :autofocus="true"
+            :label="$t('components.content.settings.base.title_optional')"
+            :disabled="render"
+        ></v-text-field>
+        <v-btn
+            elevation="0"
+            text
+            class="mb-4"
+            :disabled="render"
+            @click="block.__expandInstructions = !block.__expandInstructions"
+        >
+            <v-icon v-if="!block.__expandInstructions" color="primary"
+                >mdi-arrow-expand-all</v-icon
+            >
+            <v-icon v-if="block.__expandInstructions" color="primary">
+                mdi-arrow-collapse-all
+            </v-icon>
+        </v-btn>
+        <TextEditor
+            v-model="block.metadata.config.instructions"
+            :label="$t('components.content.settings.base.instructions')"
+            :loading="block.__expandInstructions"
+            :disabled="render"
+        />
         <v-switch
             v-model="block.metadata.config.uploadSettings.multiple"
             :label="
@@ -22,34 +50,6 @@
             "
             :disabled="render"
         ></v-select>
-        <v-btn elevation="0" text class="mt-4" :disabled="render" @click="onToggleExpand()">
-            <v-icon v-if="!block.metadata.config.expand" color="primary"
-                >mdi-arrow-expand-all</v-icon
-            >
-            <v-icon v-if="block.metadata.config.expand" color="primary">
-                mdi-arrow-collapse-all
-            </v-icon>
-        </v-btn>
-        <v-row v-if="!block.metadata.config.expand">
-            <v-col cols="12">
-                <h4 class="pb-4 pt-4">
-                    {{
-                        $t(
-                            'windward.core.components.content.blocks.user_upload.instructions_title'
-                        )
-                    }}
-                </h4>
-                <TextEditor
-                    v-model="block.metadata.config.instructions"
-                    :disabled="render"
-                />
-            </v-col>
-        </v-row>
-        <v-skeleton-loader
-            v-bind="attrs"
-            type=" table-row-divider, list-item, divider, list-item, divider, image,image"
-            v-show="block.metadata.config.expand"
-        ></v-skeleton-loader>
     </div>
 </template>
 <script>
@@ -66,6 +66,10 @@ export default {
         if (_.isEmpty(this.block)) {
             this.block = {}
         }
+
+        // Default the instructions to collapsed
+        this.block.__expandInstructions = false
+
         if (_.isEmpty(this.block.body)) {
             this.block.body = this.$t(
                 'windward.core.shared.content_blocks.title.user_upload'
@@ -77,10 +81,10 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
-        if (_.isEmpty(this.block.metadata.config.expand)) {
-            this.block.metadata.config.expand = false
+        if (_.isEmpty(this.block.metadata.config.title)) {
+            this.block.metadata.config.title = ''
         }
-        if (_.isEmpty(this.block.metadata.config.instructions)) {
+        if (_.isEmpty(this.block.metadata.config.title)) {
             this.block.metadata.config.instructions = ''
         }
         if (_.isEmpty(this.block.metadata.config.uploadSettings)) {
@@ -95,7 +99,6 @@ export default {
             valid: true,
             debounce: null,
             loading: false,
-            key: '',
             acceptOptions: [
                 {
                     name: this.$t(
@@ -142,13 +145,7 @@ export default {
         }
     },
 
-    methods: {
-        onToggleExpand() {
-            this.key = Crypto.id()
-            return (this.block.metadata.config.expand =
-                !this.block.metadata.config.expand)
-        },
-    },
+    methods: {},
 }
 </script>
 <style scoped>

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>
@@ -464,8 +477,8 @@
 </template>
 <script>
 import _ from 'lodash'
-import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
-import Uuid from '~/helpers/Uuid'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js''
+
 export default {
     name: 'VideoSettings',
     extends: BaseContentSettings,

package/components/utils/ContentViewer.vue

@@ -1,5 +1,6 @@
 <template>
     <component
+        v-show="value"
         :class="textViewer ? 'text-viewer' : ''"
         :is="convertedContent"
     ></component>

package/components/utils/TinyMCEWrapper.vue

@@ -6,9 +6,7 @@
                 (isDarkTheme ? '--theme-dark' : '--theme-light')
             "
         >
-            <label v-if="value && label" class="editor-label">{{
-                label
-            }}</label>
+            <label v-if="label" class="editor-label">{{ label }}</label>
             <Editor
                 :key="seed + (isDarkTheme ? '-theme-dark' : '-theme-light')"
                 v-model="text"
@@ -326,7 +324,7 @@ export default {
                         value: 'windward-table-subject-report',
                     },
                 ],
-                setup() {
+                setup(_editor) {
                     // Here we can add plugin
                     getTinymce().PluginManager.add(
                         'WindwardToolKit',
@@ -434,9 +432,7 @@ export default {
                 ],
                 placeholder: this.label
                     ? this.label
-                    : this.$t(
-                          'windward.core.shared.settings.title.placeholder'
-                      ),
+                    : this.$t('components.content.settings.base.placeholder'),
                 //required as it will be displayed as inline style in tinymce renderer
                 skin: false,
                 content_css: this.$vuetify.theme.isDark ? 'dark' : 'default',
@@ -539,20 +535,22 @@ export default {
 }
 </script>
 
+<style lang="scss" scoped>
+.editor-label {
+    font-size: 1rem;
+    display: block;
+    transform-origin: top left;
+    transform: scale(0.75);
+}
+</style>
+
 <style lang="scss">
-html:has(body.theme--light) {
+html body.theme--light {
     @import './assets/tinymce/ui/light/content.scss';
     @import './assets/tinymce/ui/light/skin.scss';
 }
-html:has(body.theme--dark) {
+html body.theme--dark {
     @import './assets/tinymce/ui/dark/content.scss';
     @import './assets/tinymce/ui/dark/skin.scss';
 }
-.editor-label {
-    font-size: 1rem;
-    margin-top: -1rem;
-    display: block;
-    transform-origin: top left;
-    transform: scale(0.75);
-}
 </style>

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

@@ -1,3 +1,4 @@
+@import '~/assets/sass/global.scss';
 table {
     max-width: 100%;
     border: 1px solid var(--v-primary-base);
@@ -190,6 +191,15 @@ body {
     font-family: 'Roboto', sans-serif;
 }
 
+h1, h2, h3, h4, h5, h6, ul, ol, table {
+    margin-top:16px;
+    margin-bottom:16px;
+}
+
+li::marker {
+    font-weight: bold;
+}
+
 html:has(body.editor--theme-light) {
     @import './light/content.scss';
 }

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

@@ -0,0 +1,5 @@
+export default {
+    default_title: 'Download File(s)',
+    default_instructions: 'Click on each link to download the file.',
+    no_files: 'No files',
+}

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

@@ -0,0 +1,3 @@
+export default {
+    error: "Could not generate question from provided content."
+}

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

@@ -8,6 +8,8 @@ import open_response_collate from './open_response_collate'
 import scenarioChoice from './scenario_choice'
 import email from './email'
 import block_quote from './block_quote'
+import generate_questions from './generate_questions'
+import file_download from './file_download'
 
 export default {
     user_upload,
@@ -20,4 +22,6 @@ export default {
     scenario_choice: scenarioChoice,
     email,
     block_quote,
+    generate_questions,
+    file_download,
 }

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

@@ -1,9 +1,7 @@
 export default {
     user_uploads: 'User Uploads',
     dialog_view: 'View Uploads',
-    instructions: 'Instructions:',
     instructions_none: 'None',
-    instructions_title: 'Student instructions:',
     must_save: 'You must save this block before users can make uploads',
     uploaded: 'Uploaded',
     name: 'Name',

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/en-US/components/settings/file_download.ts

@@ -0,0 +1,8 @@
+export default {
+    file_download: 'File Download',
+    no_file_selected: 'No file selected',
+    add: 'Add File',
+    filename_optional: 'Filename (Optional)',
+    place_file: 'Place File',
+    display_detailed: 'Display in detailed view',
+}

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

@@ -11,6 +11,7 @@ import tab from './tab'
 import email from './email'
 import block_quote from './block_quote'
 import horizontal_rule from './horizontal_rule'
+import file_download from './file_download'
 
 export default {
     accordion,
@@ -26,4 +27,5 @@ export default {
     email,
     block_quote,
     horizontal_rule,
+    file_download,
 }

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

@@ -17,6 +17,7 @@ export default {
         email: 'Email',
         block_quote: 'Block Quote',
         horizontal_rule: 'Divider',
+        file_download: 'File Download',
     },
     grouping: {
         basic: 'Basic Components',

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

@@ -5,6 +5,7 @@ export default {
         open_response_collate: 'Open Response Collate Settings',
         image: 'Image Settings',
         user_upload: 'User Upload Settings',
+        file_download: 'File Download Settings',
         tab_settings: 'Tab Settings',
         text_editor: 'Text Editor Settings',
         clickable_icons: 'Clickable Icons Settings',
@@ -18,9 +19,6 @@ export default {
         email: 'Email Settings',
         click_to_enter: 'Click here to enter text',
         block_quote: 'Block Quote Settings',
-        title: 'Title',
-        instructions: 'Instructions',
-        placeholder: 'Enter text here',
     },
     upload_file: 'Upload File',
     alt_image: 'Alternate text for image',

package/i18n/es-ES/components/content/blocks/file_download.ts

@@ -0,0 +1,5 @@
+export default {
+    default_title: 'Descargar archivos',
+    default_instructions: 'Haga clic en cada enlace para descargar el archivo.',
+    no_files: 'Sin archivos',
+}

package/i18n/es-ES/components/content/blocks/generate_questions.ts

@@ -0,0 +1,3 @@
+export default {
+    error: "No se pudo generar una pregunta a partir del contenido proporcionado."
+}

package/i18n/es-ES/components/content/blocks/index.ts

@@ -6,8 +6,10 @@ import feedback from './feedback'
 import open_response from './open_response'
 import open_response_collate from './open_response_collate'
 import scenarioChoice from './scenario_choice'
-import block_quote from './block_quote'
 import email from './email'
+import block_quote from './block_quote'
+import file_download from './file_download'
+import generate_questions from './generate_questions'
 
 export default {
     user_upload,
@@ -18,6 +20,8 @@ export default {
     open_response,
     open_response_collate,
     scenario_choice: scenarioChoice,
-    block_quote,
     email,
+    block_quote,
+    file_download,
+    generate_questions,
 }

package/i18n/es-ES/components/content/blocks/user_upload.ts

@@ -1,9 +1,7 @@
 export default {
     user_uploads: 'Cargas de usuarios',
     dialog_view: 'Ver cargas',
-    instructions: 'Instrucciones:',
     instructions_none: 'Ninguno',
-    instructions_title: 'Instrucciones para el estudiante:',
     must_save:
         'Debes guardar este bloque antes de que los usuarios puedan realizar cargas',
     uploaded: 'Subido',

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/es-ES/components/settings/file_download.ts

@@ -0,0 +1,8 @@
+export default {
+    file_download: 'Descarga de archivos',
+    no_file_selected: 'Ningún archivo seleccionado',
+    add: 'Agregar archivo',
+    filename_optional: 'Nombre de archivo (opcional)',
+    place_file: 'Colocar archivo',
+    display_detailed: 'Mostrar en vista detallada',
+}

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

@@ -8,9 +8,10 @@ import open_response_collate from './open_response_collate'
 import scenarioChoice from './scenario_choice'
 import accordion from './accordion'
 import tab from './tab'
-import block_quote from './block_quote'
 import email from './email'
+import block_quote from './block_quote'
 import horizontal_rule from './horizontal_rule'
+import file_download from './file_download'
 
 export default {
     accordion,
@@ -23,7 +24,8 @@ export default {
     open_response,
     open_response_collate,
     scenario_choice: scenarioChoice,
-    block_quote,
     email,
+    block_quote,
     horizontal_rule,
+    file_download,
 }

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

@@ -17,6 +17,7 @@ export default {
         email: 'Correo Electrónico',
         block_quote: 'Cotización en bloque',
         horizontal_rule: 'Divisor',
+        file_download: 'Descarga de archivos',
     },
     grouping: {
         basic: 'Componentes básicos',

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

@@ -6,6 +6,7 @@ export default {
             'Abrir configuración de clasificación de respuestas',
         image: 'Configuración de imagen',
         user_upload: 'Configuración de carga del usuario',
+        file_download: 'Configuración de descarga de archivos',
         tab_settings: 'Configuración de pestaña',
         text_editor: 'Configuración del editor de texto',
         clickable_icons:
@@ -20,9 +21,6 @@ export default {
         email: 'Ajustes del correo electrónico',
         click_to_enter: 'Haga clic para ingresar texto',
         block_quote: 'Configuración de cotización en bloque',
-        title: 'Título',
-        instructions: 'Instrucciones',
-        placeholder: 'Ingrese texto aquí',
     },
     upload_file: 'Subir Archivo',
     alt_image: 'Texto alternativo para imagen',

package/i18n/sv-SE/components/content/blocks/file_download.ts

@@ -0,0 +1,5 @@
+export default {
+    default_title: 'Ladda ner fil(er)',
+    default_instructions: 'Klicka på varje länk för att ladda ner filen.',
+    no_files: 'Inga filer',
+}

package/i18n/sv-SE/components/content/blocks/generate_questions.ts

@@ -0,0 +1,3 @@
+export default {
+    error: "Kunde inte generera en fråga från det tillhandahållna innehållet."
+}

package/i18n/sv-SE/components/content/blocks/index.ts

@@ -7,7 +7,9 @@ import open_response from './open_response'
 import open_response_collate from './open_response_collate'
 import scenarioChoice from './scenario_choice'
 import block_quote from './block_quote'
+import file_download from './file_download'
 import email from './email'
+import generate_questions from './generate_questions'
 
 export default {
     user_upload,
@@ -19,5 +21,7 @@ export default {
     open_response_collate,
     scenario_choice: scenarioChoice,
     block_quote,
+    file_download,
     email,
+    generate_questions,
 }

package/i18n/sv-SE/components/content/blocks/user_upload.ts

@@ -1,9 +1,7 @@
 export default {
     user_uploads: 'Användaruppladdningar',
     dialog_view: 'Visa uppladdningar',
-    instructions: 'Instruktioner:',
     instructions_none: 'Ingen',
-    instructions_title: 'Elev instruktioner:',
     must_save:
         'Du måste spara detta block innan användare kan göra uppladdningar',
     uploaded: 'Uppladdat',

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/i18n/sv-SE/components/settings/file_download.ts

@@ -0,0 +1,8 @@
+export default {
+    file_download: 'Filhämtning',
+    no_file_selected: 'Ingen fil har valts',
+    add: 'Lägg till fil',
+    filename_optional: 'Filnamn (valfritt)',
+    place_file: 'Placera fil',
+    display_detailed: 'Visa i detaljerad vy',
+}

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

@@ -8,9 +8,10 @@ import open_response_collate from './open_response_collate'
 import scenarioChoice from './scenario_choice'
 import accordion from './accordion'
 import tab from './tab'
-import block_quote from './block_quote'
 import email from './email'
+import block_quote from './block_quote'
 import horizontal_rule from './horizontal_rule'
+import file_download from './file_download'
 
 export default {
     accordion,
@@ -23,7 +24,8 @@ export default {
     open_response,
     open_response_collate,
     scenario_choice: scenarioChoice,
-    block_quote,
     email,
+    block_quote,
     horizontal_rule,
+    file_download,
 }

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

@@ -17,6 +17,7 @@ export default {
         email: 'E-Post',
         block_quote: 'Block citat',
         horizontal_rule: 'Delare',
+        file_download: 'Filhämtning',
     },
     grouping: {
         basic: 'Basic Components',

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

@@ -4,7 +4,8 @@ export default {
         open_response: 'Öppna svarsinställningar',
         open_response_collate: 'Öppna inställningar för svarssortering',
         image: 'Bildinställningar',
-        user_upload: 'User Upload Settings',
+        user_upload: 'Användaruppladdningsinställningar',
+        file_download: 'Filnedladdningsinställningar',
         tab_settings: 'Flikinställningar',
         text_editor: 'Textredigeringsinställningar',
         clickable_icons: 'Inställningar för klickbara ikoner',
@@ -18,9 +19,6 @@ export default {
         email: 'E-postinställningar',
         click_to_enter: 'Klicka för att skriva in text',
         block_quote: 'Blockera offertinställningar',
-        title: 'Titel',
-        instructions: 'Instruktioner',
-        placeholder: 'Skriv in text här',
     },
     upload_file: 'Ladda upp fil',
     alt_image: 'Alternativ text till bild',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/core",
-    "version": "0.4.3",
+    "version": "0.5.1",
     "description": "Windward UI Core Plugins",
     "main": "plugin.js",
     "scripts": {
@@ -21,7 +21,7 @@
     "license": "MIT",
     "homepage": "https://bitbucket.org/mindedge/windward-ui-plugin-core#readme",
     "dependencies": {
-        "@mindedge/vuetify-player": "^0.3.0",
+        "@mindedge/vuetify-player": "^0.3.1",
         "@tinymce/tinymce-vue": "^3.2.8",
         "eslint": "^8.11.0",
         "he": "^1.2.0",

package/plugin.js

@@ -19,6 +19,7 @@ import OpenResponse from './components/Content/Blocks/OpenResponse'
 import OpenResponseCollate from './components/Content/Blocks/OpenResponseCollate'
 import Image from './components/Content/Blocks/Image'
 import UserUpload from './components/Content/Blocks/UserUpload'
+import FileDownload from './components/Content/Blocks/FileDownload'
 
 import GlossaryPage from './pages/glossary.vue'
 import TinymcePlugin from './pages/plugins/tinymce/_plugin.vue'
@@ -32,6 +33,7 @@ import OpenResponseSettings from './components/Settings/OpenResponseSettings.vue
 import OpenResponseCollateSettings from './components/Settings/OpenResponseCollateSettings.vue'
 import ImageSettings from './components/Settings/ImageSettings.vue'
 import UserUploadSettings from './components/Settings/UserUploadSettings.vue'
+import FileDownloadSettings from './components/Settings/FileDownloadSettings.vue'
 import ClickableIconsSettings from './components/Settings/ClickableIconsSettings.vue'
 import ScenarioChoiceSettings from './components/Settings/ScenarioChoiceSettings.vue'
 import VideoSettings from './components/Settings/VideoSettings.vue'
@@ -220,6 +222,15 @@ export default {
                     grouping: 'components.content.blocks.group.multimedia',
                 },
             },
+            {
+                tag: 'core-file-download',
+                template: FileDownload,
+                metadata: {
+                    icon: 'mdi-cloud-download',
+                    name: 'windward.core.shared.content_blocks.title.file_download',
+                    grouping: 'components.content.blocks.group.multimedia',
+                },
+            },
             {
                 tag: 'core-clickable-icons',
                 template: ClickableIcons,
@@ -312,6 +323,15 @@ export default {
                     name: 'windward.core.shared.settings.title.user_upload',
                 },
             },
+            {
+                tag: 'core-file-download-settings',
+                template: FileDownloadSettings,
+                context: ['block.core-file-download'],
+                metadata: {
+                    icon: 'mdi-cog',
+                    name: 'windward.core.shared.settings.title.file_download',
+                },
+            },
             {
                 tag: 'core-tab-settings',
                 template: TabSettings,