@windward/games 0.2.2 → 0.4.0

package/components/settings/WordJumbleSettingsManager.vue

@@ -3,6 +3,7 @@
         <v-form ref="form" v-model="valid" v-if="!loading">
             <v-container class="pa-0">
                 <v-text-field
+                    ref="title"
                     v-model="block.metadata.config.title"
                     :counter="50"
                     outlined
@@ -12,17 +13,18 @@
                             'windward.games.components.settings.word_jumble.title_input'
                         )
                     "
-                    ref="title"
+                    :disabled="render"
                 ></v-text-field>
                 <v-textarea
+                    v-model="block.metadata.config.instructions"
                     outlined
                     auto-grow
-                    v-model="block.metadata.config.instructions"
                     :label="
                         $t(
                             'windward.games.components.settings.word_jumble.instructions'
                         )
                     "
+                    :disabled="render"
                 ></v-textarea>
             </v-container>
             <v-divider class="my-4 primary"></v-divider>
@@ -37,6 +39,7 @@
                 <SortableExpansionPanel
                     v-model="block.metadata.config.words"
                     v-bind:currentPanel.sync="block.metadata.config.currentWord"
+                    :disabled="render"
                     @click:close="onDelete($event)"
                 >
                     <template #header="{ item, index }">
@@ -59,11 +62,12 @@
                                     }}
                                 </p>
                                 <v-textarea
-                                    outlined
-                                    :autofocus="true"
                                     v-model="
                                         block.metadata.config.words[index].value
                                     "
+                                    outlined
+                                    :autofocus="true"
+                                    :disabled="render"
                                 ></v-textarea>
                             </v-flex>
                             <v-flex xs12>
@@ -75,10 +79,11 @@
                                     }}
                                 </p>
                                 <v-textarea
-                                    outlined
                                     v-model="
                                         block.metadata.config.words[index].hint
                                     "
+                                    outlined
+                                    :disabled="render"
                                 ></v-textarea>
                             </v-flex>
                         </v-container>
@@ -87,7 +92,12 @@
             </v-container>
             <v-container class="pa-0">
                 <v-row justify="center" class="my-4">
-                    <v-btn color="primary" @click="onAddWord">
+                    <v-btn
+                        color="primary"
+                        elevation="0"
+                        :disabled="render"
+                        @click="onAddWord"
+                    >
                         <v-icon>mdi-plus</v-icon>
                         {{
                             $t(
@@ -97,6 +107,7 @@
                     </v-btn>
                 </v-row>
                 <v-textarea
+                    ref="title"
                     v-model="block.metadata.config.feedback_correct"
                     outlined
                     auto-grow
@@ -106,17 +117,18 @@
                             'windward.games.components.settings.word_jumble.feedback_correct'
                         )
                     "
-                    ref="title"
+                    :disabled="render"
                 ></v-textarea>
                 <v-textarea
+                    v-model="block.metadata.config.feedback_incorrect"
                     outlined
                     auto-grow
-                    v-model="block.metadata.config.feedback_incorrect"
                     :label="
                         $t(
                             'windward.games.components.settings.word_jumble.feedback_incorrect'
                         )
                     "
+                    :disabled="render"
                 ></v-textarea>
             </v-container>
         </v-form>
@@ -132,8 +144,8 @@
 </template>
 <script>
 import _ from 'lodash'
-import BaseContentSettings from '~/components/Content/Tool/BaseContentSettings.js'
-import SortableExpansionPanel from '~/components/SortableExpansionPanel.vue'
+import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
+import SortableExpansionPanel from '~/components/Core/SortableExpansionPanel.vue'
 
 export default {
     name: 'WordJumbleSettings',

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

@@ -3,11 +3,9 @@ export default {
         slide: 'Slide {0}: {1}',
         slide_header: 'Slide header',
         slide_description: 'Slide description',
-        image_alt: 'Enter text here if not uploading image',
+        image_alt: 'Image Alt Text',
     },
     add_slide: 'Add Slide',
     amount_of_slides: 'Amount of slides',
     slideshow_title: 'Slideshow title',
-    basic_instructions:
-        "Click on the 'next' and 'previous' buttons to move through the slideshow.",
 }

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

@@ -1,7 +1,7 @@
 export default {
     title: 'Seven Strikes',
     instructions:
-        'Read the clue below, and click on the letters to spell out the word the clue refers to. If you choose a letter that isnt in the word, an X will be illuminated. When you choose an incorrect letter 7 times, the game is over.Open a text-only version of this vocabulary game in a new windowSkip this vocabulary game',
+        'Read the clue below, and click on the letters to spell out the word the clue refers to. If you choose a letter that isnt in the word, an X will be illuminated. When you choose an incorrect letter 7 times, the game is over.',
     word: 'Word or Phrase',
     hint: 'Clue',
     items: 'Seven Strikes Items',

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

@@ -8,6 +8,4 @@ export default {
     add_slide: 'Agregar diapositiva',
     amount_of_slides: 'Cantidad de diapositivas',
     slideshow_title: 'Título de la presentación de diapositivas',
-    basic_instructions:
-        "Haga clic en los botones 'siguiente' y 'anterior' para moverse por la presentación de diapositivas.",
 }

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

@@ -1,7 +1,7 @@
 export default {
     title: 'Siete golpes',
     instructions:
-        'Lea las pistas y haga clic en las letras para deletrear la palabra a la que se refiere. Si elige una letra que no está en la palabra, se iluminará una X. El juego se acaba si elijes una letra incorrecta 7 veces. Puedes tambien elejir la versión del juego en formato accesible.',
+        'Lea las pistas y haga clic en las letras para deletrear la palabra a la que se refiere. Si elige una letra que no está en la palabra, se iluminará una X. El juego se acaba si elijes una letra incorrecta 7 veces.',
     word: 'Palabra o frase',
     hint: 'Pista',
     items: 'Elementos del juego',

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

@@ -8,6 +8,4 @@ export default {
     add_slide: 'Lägg till bild',
     amount_of_slides: 'Antal bilder',
     slideshow_title: 'Slideshow title',
-    basic_instructions:
-        "Klicka på knapparna 'nästa' och 'föregående' för att gå igenom bildspelet.",
 }

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

@@ -1,7 +1,7 @@
 export default {
     title: 'Sju slag',
     instructions:
-        'Läs ledtråden nedan och klicka på bokstäverna för att stava ordet ledtråden refererar till. Om du väljer en bokstav som inte finns i ordet kommer ett X att lysa. När du väljer en felaktig bokstav 7 gånger är spelet över.Öppna en textversion av detta ordförrådsspel i ett nytt fönsterHoppa över detta ordförrådsspel',
+        'Läs ledtråden nedan och klicka på bokstäverna för att stava ordet ledtråden refererar till. Om du väljer en bokstav som inte finns i ordet kommer ett X att lysa. När du väljer en felaktig bokstav 7 gånger är spelet över.',
     word: 'Ord eller fras',
     hint: 'Clue',
     items: 'Sju Strejker Artiklar',

package/jest.config.js

@@ -9,7 +9,6 @@ module.exports = {
     },
     moduleFileExtensions: ['ts', 'js', 'vue', 'json'],
     transformIgnorePatterns: ['node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)'],
-
     transform: {
         '^.+\\.ts$': 'ts-jest',
         '^.+\\.js$': 'babel-jest',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@windward/games",
-    "version": "0.2.2",
+    "version": "0.4.0",
     "description": "Windward UI Plugin Games",
     "main": "plugin.js",
     "scripts": {
@@ -21,7 +21,7 @@
     "license": "MIT",
     "homepage": "https://bitbucket.org/mindedge/windward-ui-plugin-games#readme",
     "dependencies": {
-        "@windward/core": "^0.0.2",
+        "@windward/core": "^0.3.0",
         "eslint": "^8.11.0",
         "lodash": "^4.17.21",
         "prettier": "^2.6.0",

package/test/__mocks__/componentsMock.js

@@ -1,6 +1,7 @@
 // TODO find better way for jest to recognize utils imports
+/*
 jest.mock(
-    '~/components/SortableExpansionPanel.vue',
+    '~/components/SomeComponent.vue',
     () => {
         return {
             data() {
@@ -10,3 +11,4 @@ jest.mock(
     },
     { virtual: true }
 )
+*/

package/test/__mocks__/modelMock.js

@@ -1,88 +1,17 @@
-import { Model as mockModel } from 'vue-api-query'
-
-import axios from 'axios'
-jest.mock('axios')
-mockModel.$http = axios
-
-jest.mock('axios')
+//import { registerVirtualModels, registerModels } from '@windward/core/test/__mocks__/modelMock.js'
 
 // Define any new model mocks here. The imports / mocks will be auto-generated below
-const mockVirtualModels = [
+/*
+registerVirtualModels([
     {
-        path: '~/models/UserContentBlockState',
-        resource: 'user-content-block-state',
+        path: '~/models/MyNewModel',
+        resource: 'my-new-model',
     },
-]
-
-const mockModels = []
-
-// DO NOT ALTER THE BELOW CODE
-jest.mock('', () => {
-    return {
-        __esModule: true,
-        default: class Model {},
-    }
-})
-class mockBaseModel extends mockModel {
-    baseURL() {
-        return 'http://windwardapi.local'
-    }
-
-    request(_config) {
-        return new Promise((resolve) => {
-            resolve({ data: {} })
-        })
-    }
-}
-
-jest.mock(
-    '~/models/Model',
-    () => {
-        return {
-            __esModule: true,
-            default: class Model extends mockBaseModel {},
-        }
-    },
-    { virtual: true }
-)
-
-for (let mockI = 0; mockI < mockVirtualModels.length; mockI++) {
-    jest.mock(
-        mockVirtualModels[mockI].path,
-        () => {
-            return {
-                __esModule: true,
-                default: class Model extends mockBaseModel {
-                    resource() {
-                        return (
-                            mockVirtualModels[mockI].resource ||
-                            this.constructor.name
-                        )
-                    }
-                },
-            }
-        },
-        { virtual: true }
-    )
-}
-
-for (let mockJ = 0; mockJ < mockModels.length; mockJ++) {
-    jest.mock(mockModels[mockJ].path, () => {
-        return {
-            __esModule: true,
-            default: class Model extends mockBaseModel {
-                resource() {
-                    return mockModels[mockJ].resource || this.constructor.name
-                }
-
-                integrations() {
-                    return this
-                }
-
-                get() {
-                    return []
-                }
-            },
-        }
-    })
-}
+])
+*/
+
+/*
+registerModels([
+    { path: '../../models/UserFileAsset', resource: 'user-files' },
+])
+*/

package/test/blocks/flashcards/CardFace.spec.js

@@ -13,6 +13,8 @@ describe('CardFace', () => {
             propsData: {
                 settings,
                 textColor: '',
+                side: 'front',
+                assets: [],
             },
             mocks: defaultMocks,
         })

package/test/blocks/flashcards/Flashcard.spec.js

@@ -16,6 +16,7 @@ describe('FlashCard', () => {
                 },
                 slide: 1,
                 data: {},
+                assets: [],
             },
             mocks: defaultMocks,
         })

package/test/blocks/multipleChoice/MultipleChoice.spec.js

@@ -6,7 +6,7 @@ import Vuetify from 'vuetify'
 import Vue from 'vue'
 Vue.use(Vuetify)
 
-describe('MultipleChocie', () => {
+describe('MultipleChoice', () => {
     test('is a Vue instance', () => {
         const wrapper = shallowMount(MultipleChoice, {
             propsData: {

package/test/settings/WordJumbleManager.spec.js

@@ -49,11 +49,13 @@ describe('WordJumble manager', () => {
                 id: 1,
                 value: '',
                 hint: '',
+                shuffledWord: '',
             },
             {
                 id: 2,
                 value: '',
                 hint: '',
+                shuffledWord: '',
             },
         ])
     })
@@ -78,6 +80,7 @@ describe('WordJumble manager', () => {
                 id: 1,
                 value: '',
                 hint: '',
+                shuffledWord: '',
             },
         ])
     })