@windward/core 0.14.0 → 0.16.0

package/components/Glossary/GlossaryVerification.vue

@@ -0,0 +1,240 @@
+<template>
+    <div>
+        <v-card elevation="0">
+            <v-btn-toggle v-model="settingSelector" multiple borderless>
+                <v-tooltip top>
+                    <template #activator="{ on, attrs }">
+                        <v-btn
+                            elevation="0"
+                            v-bind="attrs"
+                            text
+                            :disabled="render"
+                            v-on="on"
+                        >
+                            <v-icon>mdi-comment-text-multiple</v-icon>
+                            {{
+                                $t(
+                                    'windward.core.components.settings.text_editor.glossary'
+                                )
+                            }}
+                        </v-btn>
+                    </template>
+                    <span>
+                        {{
+                            $t(
+                                'windward.core.components.settings.text_editor.click_to_hide_glossary'
+                            )
+                        }}</span
+                    >
+                </v-tooltip>
+
+                <slot name="actions-append"></slot>
+            </v-btn-toggle>
+            <br />
+        </v-card>
+        <div v-if="settingSelector.includes(0)" class="pt-4">
+            <br />
+            <v-card v-if="verifiedTerms.length > 0" elevation="0" outlined>
+                <v-card-title outlined class="text-capitalize">
+                    {{
+                        $t(
+                            'windward.core.components.settings.text_editor.verified_terms'
+                        )
+                    }}
+                </v-card-title>
+                <v-card-text>
+                    <v-chip
+                        v-for="(verified, index) in verifiedTerms"
+                        :key="index"
+                        class="ma-2"
+                        :close="
+                            $PermissionService.userHasAccessTo(
+                                'plugin.windward.core.organization.course.glossary',
+                                'writable'
+                            )
+                        "
+                        color="success"
+                        close-icon="mdi-pencil"
+                        :disabled="render"
+                        @click:close="editTerm(verified)"
+                    >
+                        <ContentViewer v-model="verified.term"></ContentViewer>
+                    </v-chip>
+                </v-card-text>
+            </v-card>
+            <v-card v-if="unVerifiedTerms.length > 0" elevation="0" outlined>
+                <v-card-title outlined class="text-capitalize">
+                    {{
+                        $t(
+                            'windward.core.components.settings.text_editor.unverified_terms'
+                        )
+                    }}
+                </v-card-title>
+                <v-card-text>
+                    <v-chip
+                        v-for="(unVerified, index) in unVerifiedTerms"
+                        :key="index"
+                        class="ma-2"
+                        close
+                        color="error"
+                        close-icon="mdi-content-save-plus-outline"
+                        :disabled="render"
+                        @click:close="addGlossaryTerm(unVerified)"
+                    >
+                        <ContentViewer
+                            v-model="unVerified.term"
+                        ></ContentViewer>
+                    </v-chip>
+                </v-card-text>
+            </v-card>
+            <v-card
+                v-if="
+                    verifiedTerms.length === 0 && unVerifiedTerms.length === 0
+                "
+                elevation="0"
+                outlined
+                ><v-card-text class="text-capitalize font-weight-bold">
+                    {{
+                        $t(
+                            'windward.core.components.settings.text_editor.no_glossary'
+                        )
+                    }}
+                </v-card-text></v-card
+            >
+        </div>
+        <DialogBox
+            v-model="dialog"
+            color="primary"
+            max-width="600px"
+            action-save
+            :trigger="false"
+            :disabled="
+                render ||
+                !$PermissionService.userHasAccessTo(
+                    'plugin.windward.core.organization.course.glossary',
+                    'writable'
+                )
+            "
+            @click:save="save"
+            @click:outside="close"
+            @click:close="close"
+            @keydown.esc="close"
+        >
+            <template #title> {{ formTitle }} </template>
+            <template #form="{ on, attrs }">
+                <CourseGlossaryForm
+                    v-model="selectedTerm"
+                    :glossary="glossaryTerms"
+                    :edit-mode="glossaryEdit"
+                    :disabled="
+                        !$PermissionService.userHasAccessTo(
+                            'plugin.windward.core.organization.course.glossary',
+                            'writable'
+                        )
+                    "
+                    v-bind="attrs"
+                    v-on="on"
+                ></CourseGlossaryForm>
+            </template>
+        </DialogBox>
+    </div>
+</template>
+<script>
+import _ from 'lodash'
+import { mapGetters, mapMutations, mapActions } from 'vuex'
+import DialogBox from '~/components/Core/DialogBox.vue'
+import Course from '~/models/Course'
+import CourseGlossaryTerm from '../../models/CourseGlossaryTerm'
+import CourseGlossaryForm from '../utils/glossary/CourseGlossaryForm'
+import ContentViewer from '../utils/ContentViewer.vue'
+import GlossaryHelper from '../../helpers/GlossaryHelper'
+export default {
+    name: 'GlossaryVerification',
+    components: {
+        ContentViewer,
+        DialogBox,
+        CourseGlossaryForm,
+    },
+    props: {
+        value: {
+            type: String,
+            required: false,
+            default: '',
+        },
+        render: {
+            type: Boolean,
+            required: false,
+            default: false,
+        },
+    },
+    data() {
+        return {
+            dialog: false,
+            selectedTerm: {},
+            glossaryEdit: false,
+            formTitle: '',
+            settingSelector: [0, 1],
+        }
+    },
+    computed: {
+        ...mapGetters({
+            course: 'course/get',
+            glossaryTerms: 'glossary/getTerms',
+        }),
+        ...mapMutations({
+            saveCourse: 'course/set',
+        }),
+        verifiedTerms() {
+            return GlossaryHelper.getContentVerifiedGlossaryTerms(
+                this.value,
+                this.glossaryTerms
+            )
+        },
+        unVerifiedTerms() {
+            return GlossaryHelper.getContentUnVerifiedGlossaryTerms(
+                this.value,
+                this.glossaryTerms
+            )
+        },
+    },
+    methods: {
+        ...mapActions({
+            reloadGlossary: 'glossary/load',
+        }),
+        async save() {
+            try {
+                // Save the term
+                await new CourseGlossaryTerm(_.cloneDeep(this.selectedTerm))
+                    .for(new Course(this.course))
+                    .save()
+
+                // And update our local list
+                this.reloadGlossary(this.course)
+
+                this.$toast.success(this.$t('shared.forms.saved'))
+            } catch (e) {
+                console.error('Could not save glossary term', e)
+                this.$toast.error(this.$t('shared.forms.errors.unknown'))
+            }
+        },
+        editTerm(term) {
+            this.selectedTerm = term
+
+            this.formTitle = this.$t('windward.core.pages.glossary.edit_term')
+            this.glossaryEdit = true
+            this.dialog = true
+        },
+        addGlossaryTerm(term) {
+            this.selectedTerm = term
+
+            this.formTitle = this.$t('windward.core.pages.glossary.add_term')
+            this.glossaryEdit = false
+            this.dialog = true
+        },
+        close() {
+            this.glossaryEdit = false
+            this.dialog = false
+        },
+    },
+}
+</script>

package/components/Navigation/Items/GlossaryNav.vue

@@ -3,7 +3,13 @@
         <template #activator="{ on, attrs }">
             <v-list-item
                 :class="color"
-                :to="'/course/' + course.id + '/glossary'"
+                :to="
+                    '/course/' +
+                    course.id +
+                    '/section/' +
+                    enrollment.course_section_id +
+                    '/glossary'
+                "
                 v-bind="attrs"
                 v-on="on"
             >
@@ -28,7 +34,6 @@ import { mapGetters } from 'vuex'
 
 export default {
     name: 'GlossaryNav',
-    layout: 'course',
     middleware: ['auth'],
     props: {
         color: { type: String, required: false, default: '' },
@@ -39,6 +44,7 @@ export default {
     computed: {
         ...mapGetters({
             course: 'course/get',
+            enrollment: 'enrollment/get',
         }),
     },
 }

package/components/Navigation/Items/UserUploadNav.vue

@@ -1,16 +1,35 @@
 <template>
-    <v-list-item :to="'/course/' + course.id + '/user-uploads'">
-        <v-list-item-action>
-            <v-icon>mdi-cloud-upload</v-icon>
-        </v-list-item-action>
-        <v-list-item-content>
-            <v-list-item-title
-                >{{
-                    $t('windward.core.components.navigation.user_upload.title')
-                }}
-            </v-list-item-title>
-        </v-list-item-content>
-    </v-list-item>
+    <v-tooltip right>
+        <template #activator="{ on, attrs }">
+            <v-list-item
+                :to="
+                    '/course/' +
+                    course.id +
+                    '/section/' +
+                    enrollment.course_section_id +
+                    '/user-uploads'
+                "
+                v-bind="attrs"
+                v-on="on"
+            >
+                <v-list-item-action>
+                    <v-icon>mdi-cloud-upload</v-icon>
+                </v-list-item-action>
+                <v-list-item-content>
+                    <v-list-item-title
+                        >{{
+                            $t(
+                                'windward.core.components.navigation.user_upload.title'
+                            )
+                        }}
+                    </v-list-item-title>
+                </v-list-item-content>
+            </v-list-item>
+        </template>
+        <span>{{
+            $t('windward.core.components.navigation.user_upload.title')
+        }}</span>
+    </v-tooltip>
 </template>
 
 <script>
@@ -18,7 +37,6 @@ import { mapGetters } from 'vuex'
 
 export default {
     components: {},
-    layout: 'course',
     middleware: ['auth'],
     data() {
         return {}
@@ -26,6 +44,7 @@ export default {
     computed: {
         ...mapGetters({
             course: 'course/get',
+            enrollment: 'enrollment/get',
         }),
     },
     created() {},

package/components/Settings/AccordionSettings.vue

@@ -55,41 +55,51 @@
                             "
                             :disabled="render"
                         ></v-text-field>
-                        <v-btn
-                            text
-                            elevation="0"
-                            class="mb-3"
-                            :disabled="render"
-                            @click="
-                                onToggleExpand(
-                                    block.metadata.config.items[index]
-                                )
-                            "
-                        >
-                            <v-icon
-                                v-if="
-                                    !block.metadata.config.items[index].expand
-                                "
-                                color="primary"
-                                >mdi-arrow-expand-all</v-icon
-                            >
-                            <v-icon
-                                v-if="block.metadata.config.items[index].expand"
-                                color="primary"
-                            >
-                                mdi-arrow-collapse-all
-                            </v-icon>
-                        </v-btn>
                         <TextEditor
-                            v-show="!block.metadata.config.items[index].expand"
                             v-model="block.metadata.config.items[index].content"
+                            :hide-text-editor="
+                                block.metadata.config.items[index].expand
+                            "
                             :label="
                                 $t(
                                     'windward.core.components.settings.accordion.label'
                                 )
                             "
                             :disabled="render"
-                        ></TextEditor>
+                            show-glossary
+                        >
+                            <template #glossary-actions-append>
+                                <v-btn
+                                    text
+                                    elevation="0"
+                                    class="mb-3"
+                                    :disabled="render"
+                                    @click="
+                                        onToggleExpand(
+                                            block.metadata.config.items[index]
+                                        )
+                                    "
+                                >
+                                    <v-icon
+                                        v-if="
+                                            !block.metadata.config.items[index]
+                                                .expand
+                                        "
+                                        color="primary"
+                                        >mdi-arrow-expand-all</v-icon
+                                    >
+                                    <v-icon
+                                        v-if="
+                                            block.metadata.config.items[index]
+                                                .expand
+                                        "
+                                        color="primary"
+                                    >
+                                        mdi-arrow-collapse-all
+                                    </v-icon>
+                                </v-btn>
+                            </template>
+                        </TextEditor>
                         <v-container class="pa-0 pt-3">
                             <h4>
                                 {{

package/components/Settings/ClickableIconsSettings.vue

@@ -173,6 +173,7 @@
                                         .fileConfig
                                 "
                                 :assets.sync="block.assets"
+                                :disabled="render"
                                 hide-background
                                 hide-decorative
                                 hide-modal

package/components/Settings/ImageSettings.vue

@@ -3,6 +3,7 @@
         <ImageAssetSettings
             v-model="block.metadata.config"
             :assets.sync="block.assets"
+            :disabled="render"
         >
         </ImageAssetSettings>
     </v-container>
@@ -10,26 +11,22 @@
 
 <script>
 import _ from 'lodash'
-import TextEditor from '~/components/Text/TextEditor'
-import TextViewer from '~/components/Text/TextViewer'
 import BaseContentSettings from '~/components/Content/Settings/BaseContentSettings.js'
-import ContentBlockAsset from '~/components/Content/ContentBlockAsset.vue'
 import ImageAssetSettings from '~/components/Content/Settings/ImageAssetSettings.vue'
 
 export default {
     name: 'ImageSettings',
-    extends: BaseContentSettings,
     components: {
         ImageAssetSettings,
-        ContentBlockAsset,
-        TextEditor,
-        TextViewer,
     },
+    extends: BaseContentSettings,
     props: {
         settings: { type: Object, required: false, default: null },
         context: { type: String, required: false, default: 'block' },
     },
-    computed: {},
+    data() {
+        return {}
+    },
     beforeMount() {
         if (_.isEmpty(this.block)) {
             this.block = {}
@@ -65,10 +62,6 @@ export default {
             this.block.metadata.config.ariaDescribedBy = ''
         }
     },
-    data() {
-        return {}
-    },
-    watch: {},
     mounted() {},
     methods: {},
 }

package/components/Settings/TabSettings.vue

@@ -41,39 +41,49 @@
                         {{ $t('windward.core.components.settings.tab.header') }}
                     </p>
                     <v-text-field
+                        v-model="block.metadata.config.items[index].tabHeader"
                         outlined
                         :autofocus="true"
-                        v-model="block.metadata.config.items[index].tabHeader"
                         :rules="$Validation.getRule('shortInput')"
                         :counter="$Validation.getLimit('shortInput')"
                         :label="'item ' + (index + 1)"
                         :disabled="render"
                     ></v-text-field>
-                    <v-btn
-                        @click="onToggleExpand(index)"
-                        text
-                        elevation="0"
-                        class="mb-3"
-                        :disabled="render"
-                    >
-                        <v-icon
-                            v-if="!block.metadata.config.items[index].expand"
-                            color="primary"
-                            >mdi-arrow-expand-all</v-icon
-                        >
-                        <v-icon
-                            v-if="block.metadata.config.items[index].expand"
-                            color="primary"
-                        >
-                            mdi-arrow-collapse-all
-                        </v-icon>
-                    </v-btn>
                     <TextEditor
-                        v-model="block.metadata.config.items[index].content"
-                        v-if="!item.expand"
                         :key="textEditorUpdateKey"
+                        v-model="block.metadata.config.items[index].content"
                         :disabled="render"
-                    ></TextEditor>
+                        show-glossary
+                        :hide-text-editor="item.expand"
+                    >
+                        <template #glossary-actions-append>
+                            <v-btn
+                                text
+                                elevation="0"
+                                class="mb-3"
+                                :disabled="render"
+                                @click="onToggleExpand(index)"
+                            >
+                                <v-icon
+                                    v-if="
+                                        !block.metadata.config.items[index]
+                                            .expand
+                                    "
+                                    color="primary"
+                                    >mdi-arrow-expand-all</v-icon
+                                >
+                                <v-icon
+                                    v-if="
+                                        block.metadata.config.items[index]
+                                            .expand
+                                    "
+                                    color="primary"
+                                >
+                                    mdi-arrow-collapse-all
+                                </v-icon>
+                            </v-btn>
+                        </template>
+                    </TextEditor>
 
                     <v-card class="mt-2">
                         <v-card-text class="pa-0">