@windward/core 0.6.0 → 0.8.0

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 # Changelog
 
-### Release [0.6.0] created - 2024-07-30
+## Release [0.7.0] - 2024-08-29
+
+* Version bump to 0.7.0
+
 
+### Release [0.7.0] created - 2024-08-29
+
+
+### Release [0.6.0] created - 2024-07-30

package/components/Content/Blocks/Accordion.vue

@@ -1,5 +1,24 @@
 <template>
     <div>
+        <v-container
+            class="pa-0"
+            v-if="
+                block.metadata.config.title ||
+                block.metadata.config.instructions
+            "
+        >
+            <h2 v-if="block.metadata.config.title" tabindex="0">
+                {{ block.metadata.config.title }}
+            </h2>
+
+            <p
+                v-if="block.metadata.config.instructions"
+                tabindex="0"
+                class="pt-3"
+            >
+                {{ block.metadata.config.instructions }}
+            </p>
+        </v-container>
         <v-expansion-panels
             :value="selectedPanels"
             flat
@@ -91,6 +110,9 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
+        if (_.isEmpty(this.block.metadata.config.title)) {
+            this.block.metadata.config.title = ''
+        }
         if (_.isEmpty(this.block.metadata.config.items)) {
             const defaultObject = {
                 header: '',

package/components/Content/Blocks/BlockQuote.vue

@@ -7,10 +7,14 @@
             "
         >
             <v-col cols="12" class="pb-0">
-                <h2 v-if="block.metadata.config.title">
+                <h2 v-if="block.metadata.config.title" tabindex="0">
                     {{ block.metadata.config.title }}
                 </h2>
-                <p v-if="block.metadata.config.instructions" class="pb-0 mb-0">
+                <p
+                    v-if="block.metadata.config.instructions"
+                    tabindex="0"
+                    class="pt-3"
+                >
                     {{ block.metadata.config.instructions }}
                 </p>
             </v-col>

package/components/Content/Blocks/ClickableIcons.vue

@@ -1,9 +1,17 @@
 <template>
     <div>
         <v-container class="pa-0">
-            <h2>{{ block.metadata.config.title }}</h2>
+            <h2 v-if="block.metadata.config.title" tabindex="0">
+                {{ block.metadata.config.title }}
+            </h2>
 
-            <p>{{ block.metadata.config.description }}</p>
+            <p
+                v-if="block.metadata.config.description"
+                tabindex="0"
+                class="pt-3"
+            >
+                {{ block.metadata.config.description }}
+            </p>
 
             <p>
                 {{
@@ -50,7 +58,7 @@
                     </button>
                 </v-col>
                 <v-col cols="12" v-bind="bodyColumnAttrs">
-                    <v-container class="ml-4">
+                    <v-container :class="bodyClass">
                         <h4
                             v-if="
                                 block.metadata.config.display.show_title ||
@@ -155,7 +163,7 @@ export default {
             } else {
                 return {
                     xl: '2',
-                    lg: '2',
+                    lg: '3',
                     md: '3',
                     sm: '3',
                 }
@@ -240,6 +248,13 @@ export default {
                 }
             }
         },
+        bodyClass() {
+            if (window.innerWidth <= 665) {
+                return ''
+            } else {
+                return 'ml-4'
+            }
+        },
     },
     methods: {
         isIcon(str) {

package/components/Content/Blocks/Email.vue

@@ -7,10 +7,14 @@
             "
         >
             <v-col cols="12" class="pa-0">
-                <h2 v-if="block.metadata.config.title">
+                <h2 v-if="block.metadata.config.title" tabindex="0">
                     {{ block.metadata.config.title }}
                 </h2>
-                <p v-if="block.metadata.config.instructions" class="pb-0 mb-0">
+                <p
+                    v-if="block.metadata.config.instructions"
+                    tabindex="0"
+                    class="pt-3"
+                >
                     {{ block.metadata.config.instructions }}
                 </p>
             </v-col>
@@ -25,7 +29,7 @@
                     class="pa-0 primary container-subject d-flex justify-center align-center"
                 >
                     <v-row class="d-flex ma-5">
-                        <v-col cols="6">
+                        <v-col cols="12">
                             {{
                                 $t(
                                     'windward.core.components.content.blocks.email.email'
@@ -33,6 +37,7 @@
                             }}
                         </v-col>
                         <v-col
+                            v-if="false"
                             cols="6"
                             class="d-flex justify-end column-simulation"
                         >
@@ -197,6 +202,7 @@
                                 </v-col>
                                 <v-col cols="2" class="pa-0 d-flex justify-end">
                                     <v-btn
+                                        v-show="false"
                                         elevation="0"
                                         color="primary"
                                         outlined
@@ -350,4 +356,7 @@ export default {
 .v-expansion-panels {
     z-index: 0 !important;
 }
+.v-btn:before {
+    background-color: transparent !important;
+}
 </style>

package/components/Content/Blocks/GenerateAIQuestionButton.vue

@@ -1,13 +1,17 @@
 <template>
     <v-btn
         elevation="0"
-        color="primary"
-        icon
+        color="secondary"
         @click="generateAIQuestion"
         :loading="isLoading"
         :disabled="isLoading"
     >
-        <v-icon v-if="!isLoading">mdi-magic-staff</v-icon>
+        <v-icon class="pr-1" v-if="!isLoading">mdi-magic-staff</v-icon>
+        {{
+            this.$t(
+                'windward.core.components.content.blocks.generate_questions.button_label'
+            )
+        }}
         <template v-slot:loader>
             <v-progress-circular indeterminate size="23"></v-progress-circular>
         </template>
@@ -42,7 +46,7 @@ export default {
                     new Content(this.content),
                     new Assessment({ id: this.block.id }),
                     new AssessmentQuestion(),
-					`suggest/${this.questionType}`
+                    `suggest/${this.questionType}`
                 ).get()
 
                 if (response && response.length > 0) {
@@ -51,11 +55,15 @@ export default {
                 }
             } catch (error) {
                 console.error(error)
-                this.$dialog.error(this.$t('windward.core.components.content.blocks.generate_questions.error'))
+                this.$dialog.error(
+                    this.$t(
+                        'windward.core.components.content.blocks.generate_questions.error'
+                    )
+                )
             } finally {
                 this.isLoading = false
             }
         },
     },
 }
-</script>
+</script>

package/components/Content/Blocks/HorizontalRule.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <hr :class="isDashed" />
+        <hr :class="isDashed" class="mt-2 mb-2" />
     </div>
 </template>
 <script>
@@ -19,15 +19,14 @@ export default {
         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 {
+            saveState: false,
+            trackable: false,
             isDashed: 'solid',
         }
     },

package/components/Content/Blocks/OpenResponse.vue

@@ -1,5 +1,24 @@
 <template>
     <div>
+        <v-container
+            class="pa-0"
+            v-if="
+                block.metadata.config.title ||
+                block.metadata.config.instructions
+            "
+        >
+            <h2 v-if="block.metadata.config.title" tabindex="0">
+                {{ block.metadata.config.title }}
+            </h2>
+
+            <p
+                v-if="block.metadata.config.instructions"
+                tabindex="0"
+                class="pt-3"
+            >
+                {{ block.metadata.config.instructions }}
+            </p>
+        </v-container>
         <div v-if="stateLoaded">
             <div v-if="block.body && !submitted">
                 <TextViewer v-model="block.body" :height="200"></TextViewer>
@@ -118,6 +137,12 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
+        if (_.isEmpty(this.block.metadata.config.title)) {
+            this.block.metadata.config.title = ''
+        }
+        if (_.isEmpty(this.block.metadata.config.instructions)) {
+            this.block.metadata.config.instructions = ''
+        }
         if (_.isEmpty(this.block.metadata.config.sample_response)) {
             this.block.metadata.config.sample_response = ''
         }

package/components/Content/Blocks/OpenResponseCollate.vue

@@ -1,7 +1,13 @@
 <template>
     <div>
         <div v-if="block.metadata.config.linked.length">
-            <v-btn elevation="0" color="primary" outlined block @click="onCollate">
+            <v-btn
+                elevation="0"
+                color="primary"
+                outlined
+                block
+                @click="onCollate"
+            >
                 <v-icon class="mr-3">mdi-file-word</v-icon>
                 {{
                     $t(
@@ -74,19 +80,14 @@ export default {
                         'metadata->block->block_id',
                         this.block.metadata.config.linked
                     )
+                    .with('contentBlock')
                     .get()
-                let collated = ''
-                const sortedStates = []
 
-                // Sorted the states based on the linked order
-                this.block.metadata.config.linked.forEach((linkedId) => {
-                    const found = userState.find((state) => {
-                        return state.metadata.block.block_id === linkedId
-                    })
-                    if (found) {
-                        sortedStates.push(found)
-                    }
-                })
+                let collated = ''
+                // sort by order on the page
+                const sortedStates = userState.sort((a, b) =>
+                    a.content_block.order < b.content_block.order ? -1 : 1
+                )
 
                 sortedStates.forEach((state) => {
                     // Prepend the prompt from the state if include prompts is enabled

package/components/Content/Blocks/ScenarioChoice.vue

@@ -1,20 +1,26 @@
 <template>
     <div>
         <v-container class="pa-0">
-            <h2>{{ block.metadata.config.title }}</h2>
-            <p>{{ block.metadata.config.description }}</p>
-            <p>
-                {{
-                    $t(
-                        'windward.core.components.content.blocks.scenario_choice.information'
-                    )
-                }}
+            <h2 v-if="block.metadata.config.title" tabindex="0">
+                {{ block.metadata.config.title }}
+            </h2>
+            <p
+                v-if="block.metadata.config.description"
+                tabindex="0"
+                class="pt-3"
+            >
+                {{ block.metadata.config.description }}
             </p>
             <div
                 v-if="choiceIndex !== null && block.metadata.config.show_reset"
                 class="text-right"
             >
-                <v-btn elevation="0" color="primary" outlined @click="onClickReset">
+                <v-btn
+                    elevation="0"
+                    color="primary"
+                    outlined
+                    @click="onClickReset"
+                >
                     {{
                         $t(
                             'windward.core.components.content.blocks.scenario_choice.try_again'
@@ -30,7 +36,7 @@
                 no-gutters
                 :class="rowClass(item, itemIndex)"
             >
-                <v-col cols="2" class="text-center">
+                <v-col cols="12" v-bind="iconColumnAttrs" class="text-center">
                     <div
                         class="pt-8 pb-8 text-icon-container mb-4 mx-auto"
                         role="button"
@@ -48,30 +54,34 @@
                         }}
                     </strong>
                 </v-col>
-                <v-col cols="10">
-                    <h4
-                        role="button"
-                        class="mt-4"
-                        @click="onClickItem(itemIndex)"
-                    >
-                        {{ item.title }}
-                    </h4>
+                <v-col cols="12" v-bind="bodyColumnAttrs">
+                    <v-container :class="bodyClass">
+                        <h4
+                            role="button"
+                            class="mt-4"
+                            @click="onClickItem(itemIndex)"
+                        >
+                            {{ item.title }}
+                        </h4>
 
-                    <v-expand-transition>
-                        <div v-if="choiceIndex !== null">
-                            <v-divider light class="my-4" />
-                            <TextViewer v-model="item.body"></TextViewer>
-                            <a
-                                v-if="linkedPage !== null"
-                                class="white--text text-decoration-underline"
-                                @click="
-                                    onClickLink(linkedPage.course_content_id)
-                                "
-                            >
-                                {{ linkedPage.text }}
-                            </a>
-                        </div>
-                    </v-expand-transition>
+                        <v-expand-transition>
+                            <div v-if="choiceIndex !== null">
+                                <v-divider light class="my-4" />
+                                <TextViewer v-model="item.body"></TextViewer>
+                                <a
+                                    v-if="linkedPage !== null"
+                                    class="white--text text-decoration-underline"
+                                    @click="
+                                        onClickLink(
+                                            linkedPage.course_content_id
+                                        )
+                                    "
+                                >
+                                    {{ linkedPage.text }}
+                                </a>
+                            </div>
+                        </v-expand-transition>
+                    </v-container>
                 </v-col>
             </v-row>
         </v-container>
@@ -199,6 +209,29 @@ export default {
                 return null
             }
         },
+        iconColumnAttrs() {
+            return {
+                xl: '2',
+                lg: '3',
+                md: '3',
+                sm: '3',
+            }
+        },
+        bodyColumnAttrs() {
+            return {
+                xl: '10',
+                lg: '9',
+                md: '9',
+                sm: '9',
+            }
+        },
+        bodyClass() {
+            if (window.innerWidth <= 665) {
+                return ''
+            } else {
+                return 'ml-4'
+            }
+        },
     },
     beforeMount() {
         // Apply the default config

package/components/Content/Blocks/Tab.vue

@@ -1,5 +1,24 @@
 <template>
     <div>
+        <v-container
+            v-if="
+                block.metadata.config.title ||
+                block.metadata.config.instructions
+            "
+            class="pa-0"
+        >
+            <h2 v-if="block.metadata.config.title" tabindex="0">
+                {{ block.metadata.config.title }}
+            </h2>
+
+            <p
+                v-if="block.metadata.config.instructions"
+                tabindex="0"
+                class="pt-3"
+            >
+                {{ block.metadata.config.instructions }}
+            </p>
+        </v-container>
         <v-container class="pa-0">
             <v-tabs dark v-model="block.metadata.config.currentTab" show-arrows>
                 <v-tabs-slider></v-tabs-slider>

package/components/Content/Blocks/UserUpload.vue

@@ -1,19 +1,14 @@
 <template>
     <v-container class="pa-0">
         <div>
-            <h2 v-if="block.metadata.config.title">
+            <h2 v-if="block.metadata.config.title" tabindex="0">
                 {{ block.metadata.config.title }}
             </h2>
             <v-row>
-                <v-col cols="12">
-                    <TextViewer
-                        v-if="render || !block.__expandInstructions"
-                        v-model="block.metadata.config.instructions"
-                    ></TextViewer>
-                    <TextEditor
-                        v-if="!render && block.__expandInstructions"
-                        v-model="block.metadata.config.instructions"
-                    />
+                <v-col v-if="block.metadata.config.instructions" cols="12">
+                    <p tabindex="0" class="pt-3">
+                        {{ block.metadata.config.instructions }}
+                    </p>
                 </v-col>
                 <v-col v-if="!blockExists" cols="12">
                     <v-alert color="warning">