@windward/games 0.5.1 → 0.7.0

package/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+## 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/bitbucket-pipelines.yml

@@ -0,0 +1,14 @@
+image: atlassian/default-image:3
+
+pipelines:
+  custom:
+    create-release:
+      import: infrastructure-automation:master:create-release
+    publish-release:
+      import: infrastructure-automation:master:publish-release
+
+  branches:
+    "release/*":
+      import: infrastructure-automation:master:auto-update
+    "hotfix/*":
+      import: infrastructure-automation:master:auto-update

package/components/content/blocks/dragDrop/BucketGame.vue

@@ -253,6 +253,7 @@ import _ from 'lodash'
 import CrudTable from '../../CrudTable'
 import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
 import TextViewer from '~/components/Text/TextViewer.vue'
+import Uuid from '~/helpers/Uuid'
 
 export default {
     name: 'BucketGame',
@@ -268,7 +269,11 @@ export default {
         if (_.isEmpty(this.block.metadata.config)) {
             this.block.metadata.config = {}
         }
-        if (_.isEmpty(this.block.metadata.config.title)) {
+        if (
+            _.isEmpty(this.block.metadata.config.title) &&
+            this.block.id &&
+            !Uuid.test(this.block.id)
+        ) {
             this.block.metadata.config.title = this.$t(
                 'windward.games.components.content.blocks.bucket_game.game_title'
             )
@@ -277,14 +282,10 @@ export default {
             this.block.metadata.config.instructions = ''
         }
         if (_.isEmpty(this.block.metadata.config.feedback_correct)) {
-            this.block.metadata.config.feedback_correct = this.$t(
-                'windward.games.components.settings.bucket_game.form.feedback.correct_default'
-            )
+            this.block.metadata.config.feedback_correct = ''
         }
         if (_.isEmpty(this.block.metadata.config.feedback_incorrect)) {
-            this.block.metadata.config.feedback_incorrect = this.$t(
-                'windward.games.components.settings.bucket_game.form.feedback.incorrect_default'
-            )
+            this.block.metadata.config.feedback_incorrect = ''
         }
         if (_.isEmpty(this.block.metadata.config.bucket_titles)) {
             this.block.metadata.config.bucket_titles = []
@@ -429,7 +430,6 @@ export default {
                 if (
                     element.bucket_index === item.bucket_index &&
                     element.display === item.display &&
-                    element.display_value === item.display_value &&
                     element.feedback === item.feedback &&
                     element.id === item.id
                 ) {
@@ -467,6 +467,17 @@ export default {
                     )
                 } else {
                     this.status = 'successOutline'
+                    // set correct feedback
+                    if (evt.added.element.feedback) {
+                        this.feedback = evt.added.element.feedback
+                    } else {
+                        this.feedback = this.block.metadata.config
+                            .feedback_correct
+                            ? this.block.metadata.config.feedback_correct
+                            : this.$t(
+                                  'windward.games.components.settings.bucket_game.form.feedback.correct_default'
+                              )
+                    }
                 }
             } else {
                 let items = this.items[bucket_index]
@@ -474,7 +485,12 @@ export default {
                 this.items[bucket_index].splice(indexOfAddedElement, 1)
                 // puts item back into mutable array for draggable component
                 this.mainAnswer.push(evt.added.element)
+                // set incorrect feedback
                 this.feedback = this.block.metadata.config.feedback_incorrect
+                    ? this.block.metadata.config.feedback_incorrect
+                    : this.$t(
+                          'windward.games.components.settings.bucket_game.form.feedback.incorrect_default'
+                      )
                 this.status = 'errorOutline'
             }
         },

package/components/content/blocks/flashcards/CardFace.vue

@@ -2,7 +2,7 @@
     <v-container>
         <br />
         <div class="card-content">
-            <v-row align="center" justify="center">
+            <v-row>
                 <content-viewer :class="textClass" v-model="settings.text" />
             </v-row>
             <br />
@@ -51,7 +51,7 @@ export default {
                 this.settings.text.length < 100 &&
                 this.side === 'front'
             ) {
-                return 'text-justify centered card-content--bold'
+                return 'centered card-content--bold'
             }
 
             if (this.side === 'front') {
@@ -66,7 +66,7 @@ export default {
                 return 'text-justify centered'
             }
 
-            return 'px-6  text-justify'
+            return 'px-6  text-left'
         },
         imageAsset() {
             if (!this.settings.imageAsset) {

package/components/content/blocks/matchingGame/MatchingGame.vue

@@ -12,18 +12,10 @@
                 {{ block.metadata.config.title }}
             </h2>
 
-            <p tabindex="0">
+            <p>
                 {{ block.metadata.config.instructions }}
             </p>
-            <p tabindex="0">
-                {{
-                    $t(
-                        'windward.games.components.content.blocks.matching_game.description'
-                    )
-                }}
-            </p>
-
-            <v-container fluid :class="status">
+            <v-container :class="status">
                 <v-row class="d-flex justify-center pa-2">{{
                     feedback
                         ? feedback
@@ -47,34 +39,7 @@
                     </v-container>
                 </v-row>
             </v-container>
-            <v-container class="pa-0">
-                <v-row>
-                    <draggable
-                        v-bind="dragOptions"
-                        class="d-flex justify-space-between flex-wrap col-md-12"
-                        :list="block.metadata.config.answerObjects"
-                        :disabled="!allowDrag"
-                        :group="{
-                            name: 'people',
-                            pull: 'clone',
-                            put: false,
-                        }"
-                        @end="onEnd"
-                    >
-                        <v-card
-                            v-for="(answer, aindex) in block.metadata.config
-                                .answerObjects"
-                            :key="aindex"
-                            class="pa-2 ma-2 answerCard container-outline"
-                            outlined
-                        >
-                            <v-icon>mdi-drag-vertical</v-icon>
-                            <span>
-                                {{ answer.display }}
-                            </span>
-                        </v-card>
-                    </draggable>
-                </v-row>
+            <v-container class="pl-0 pr-0 mt-2">
                 <v-row
                     v-if="render"
                     class="d-flex flex-wrap flex-row justify-center flex-fill"
@@ -267,6 +232,33 @@
                         </v-card>
                     </v-row>
                 </v-row>
+                <v-row>
+                    <draggable
+                        v-bind="dragOptions"
+                        class="d-flex justify-space-between flex-wrap col-md-12"
+                        :list="block.metadata.config.answerObjects"
+                        :disabled="!allowDrag"
+                        :group="{
+                            name: 'people',
+                            pull: 'clone',
+                            put: false,
+                        }"
+                        @end="onEnd"
+                    >
+                        <v-card
+                            v-for="(answer, aindex) in block.metadata.config
+                                .answerObjects"
+                            :key="aindex"
+                            class="pa-2 ma-2 answerCard container-outline"
+                            outlined
+                        >
+                            <v-icon>mdi-drag-vertical</v-icon>
+                            <span>
+                                {{ answer.display }}
+                            </span>
+                        </v-card>
+                    </draggable>
+                </v-row>
                 <v-container
                     class="d-flex flex-wrap flex-row justify-center flex-fill"
                     align="end"

package/components/content/blocks/sevenStrikes/SevenStikes.vue

@@ -234,14 +234,10 @@ export default {
             )
         }
         if (_.isEmpty(this.block.metadata.config.feedback_correct)) {
-            this.block.metadata.config.feedback_correct = this.$t(
-                'windward.games.components.settings.bucket_game.form.feedback.correct_default'
-            )
+            this.block.metadata.config.feedback_correct = ''
         }
         if (_.isEmpty(this.block.metadata.config.feedback_correct)) {
-            this.block.metadata.config.feedback_incorrect = this.$t(
-                'windward.games.components.settings.bucket_game.form.feedback.incorrect_default'
-            )
+            this.block.metadata.config.feedback_incorrect = ''
         }
         if (_.isEmpty(this.block.metadata.config.words)) {
             this.block.metadata.config.words = []

package/components/content/blocks/wordJumble/WordJumble.vue

@@ -164,6 +164,7 @@ import _ from 'lodash'
 import Jumble from './Jumble.vue'
 import BaseContentBlock from '~/components/Content/Blocks/BaseContentBlock'
 import Crypto from '~/helpers/Crypto'
+import Uuid from '~/helpers/Uuid'
 
 export default {
     name: 'WordJumble',
@@ -183,23 +184,23 @@ export default {
         }
         if (_.isEmpty(this.block.metadata.config.title)) {
             this.block.metadata.config.title = this.$t(
-                'windward.games.components.content.blocks.word_jumble.title'
+                'windward.games.components.settings.word_jumble.title'
             )
         }
-        if (_.isEmpty(this.block.metadata.config.instructions)) {
+        if (
+            _.isEmpty(this.block.metadata.config.instructions) &&
+            this.block.id &&
+            !Uuid.test(this.block.id)
+        ) {
             this.block.metadata.config.instructions = this.$t(
                 'windward.games.components.content.blocks.word_jumble.instructions'
             )
         }
         if (_.isEmpty(this.block.metadata.config.feedback_correct)) {
-            this.block.metadata.config.feedback_correct = this.$t(
-                'windward.games.components.settings.bucket_game.form.feedback.correct_default'
-            )
+            this.block.metadata.config.feedback_correct = ''
         }
         if (_.isEmpty(this.block.metadata.config.feedback_incorrect)) {
-            this.block.metadata.config.feedback_incorrect = this.$t(
-                'windward.games.components.settings.bucket_game.form.feedback.incorrect_default'
-            )
+            this.block.metadata.config.feedback_incorrect = ''
         }
         if (_.isEmpty(this.block.metadata.config.words)) {
             this.block.metadata.config.words = []